Merge pull request #16028 from jcsp/wip-mgr-commands

author Kefu Chai <tchaikov@gmail.com>

Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)

committer GitHub <noreply@github.com>

Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)
committer GitHub <noreply@github.com>
Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)
diff --cc src/librados/librados.cc
Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)
committer	GitHub <noreply@github.com>
	Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)
		1	2
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/Mgr.cc	patch \|	diff1 \|	diff2 \|	blob \| history