projects / platform / core / base / libsqlfs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e5d321 9659b9b)
Merge branch 'master' into systemd
authorWilliam Douglas <william.douglas@intel.com>
Wed, 14 Nov 2012 20:32:11 +0000 (12:32 -0800)
committerWilliam Douglas <william.douglas@intel.com>
Wed, 14 Nov 2012 20:32:50 +0000 (12:32 -0800)
commit4622b42c2ef45b9d9b03dd1d8d318b6826248907
treef7adee8c378581857a51cc3cfa8c09b07a60c7dftree | snapshot
parent1e5d321cfb8c052ecedb9d68ccabc36e9a8d21c7commit | diff
parent9659b9bec41b419ec20f06a81b09ab1d3b8452ddcommit | diff
Merge branch 'master' into systemd

Conflicts:
packaging/libsqlfs.spec

Update and add smack labels in a systemd unit file to mirror changes in
the sqlfs-mount sysv init script.

Signed-off-by: William Douglas <william.douglas@intel.com>
packaging/libsqlfs.spec diff1 | diff2 | blob | history
packaging/opt-var-kdb-db-smack-labels.service | | blob
Domain: System / Base; Licenses: LGPL-2.1;