Merge pull request #11542 from batrick/systemd-ceph-fuse

author John Spray <jspray@redhat.com>

Wed, 14 Dec 2016 13:55:33 +0000 (13:55 +0000)

committer GitHub <noreply@github.com>

Wed, 14 Dec 2016 13:55:33 +0000 (13:55 +0000)
author John Spray <jspray@redhat.com>
Wed, 14 Dec 2016 13:55:33 +0000 (13:55 +0000)
committer GitHub <noreply@github.com>
Wed, 14 Dec 2016 13:55:33 +0000 (13:55 +0000)
diff --cc ceph.spec.in
Simple merge
diff --cc debian/rules
Simple merge
author	John Spray <jspray@redhat.com>
	Wed, 14 Dec 2016 13:55:33 +0000 (13:55 +0000)
committer	GitHub <noreply@github.com>
	Wed, 14 Dec 2016 13:55:33 +0000 (13:55 +0000)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/rules	patch \|	diff1 \|	diff2 \|	blob \| history