Merge remote-tracking branch 'gh/jewel'

author Sage Weil <sage@redhat.com>

Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)

committer Sage Weil <sage@redhat.com>

Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)
author Sage Weil <sage@redhat.com>
Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)
committer Sage Weil <sage@redhat.com>
Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)
diff --cc ceph.spec.in
Simple merge
diff --cc configure.ac
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history