Merge pull request #2560 from ceph/wip-9418

author Sage Weil <sage@redhat.com>

Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)

committer Sage Weil <sage@redhat.com>

Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)
author Sage Weil <sage@redhat.com>
Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)
committer Sage Weil <sage@redhat.com>
Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history