Merge pull request #9259 from xiexingguo/xxg-wip-fix-monclientpinger

author Yuri Weinstein <yuri.weinstein@gmail.com>

Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)

committer GitHub <noreply@github.com>

Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)
committer GitHub <noreply@github.com>
Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)
diff --cc src/mon/MonClient.cc
Simple merge
diff --cc src/mon/MonClient.h
Simple merge
diff --cc src/test/pybind/test_rados.py
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)
committer	GitHub <noreply@github.com>
	Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)
		1	2
src/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/pybind/test_rados.py	patch \|	diff1 \|	diff2 \|	blob \| history