Merge remote-tracking branch 'origin/next'

author Josh Durgin <jdurgin@redhat.com>

Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)

committer Josh Durgin <jdurgin@redhat.com>

Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
author Josh Durgin <jdurgin@redhat.com>
Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
committer Josh Durgin <jdurgin@redhat.com>
Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/rbd.cc
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
committer	Josh Durgin <jdurgin@redhat.com>
	Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history