Merge pull request #5712 from yuyuyu101/wip-12801

author Sage Weil <sage@redhat.com>

Wed, 2 Sep 2015 14:15:44 +0000 (10:15 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 2 Sep 2015 14:15:44 +0000 (10:15 -0400)
author Sage Weil <sage@redhat.com>
Wed, 2 Sep 2015 14:15:44 +0000 (10:15 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 2 Sep 2015 14:15:44 +0000 (10:15 -0400)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/test/pybind/test_ceph_argparse.py
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 2 Sep 2015 14:15:44 +0000 (10:15 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 2 Sep 2015 14:15:44 +0000 (10:15 -0400)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/pybind/test_ceph_argparse.py	patch \|	diff1 \|	diff2 \|	blob \| history