Merge pull request #7907 from dachary/wip-subman-facts

author Sage Weil <sage@redhat.com>

Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)
author Sage Weil <sage@redhat.com>
Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)
diff --cc ceph.spec.in
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history