Merge remote-tracking branch 'gh/jewel'

author Sage Weil <sage@redhat.com>

Thu, 3 Mar 2016 18:35:13 +0000 (13:35 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 3 Mar 2016 18:35:13 +0000 (13:35 -0500)
author Sage Weil <sage@redhat.com>
Thu, 3 Mar 2016 18:35:13 +0000 (13:35 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 3 Mar 2016 18:35:13 +0000 (13:35 -0500)
diff --cc ceph.spec.in
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 3 Mar 2016 18:35:13 +0000 (13:35 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 3 Mar 2016 18:35:13 +0000 (13:35 -0500)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history