Merge pull request #10584 from tchaikov/wip-16933

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

Mon, 22 Aug 2016 20:25:10 +0000 (13:25 -0700)

committer GitHub <noreply@github.com>

Mon, 22 Aug 2016 20:25:10 +0000 (13:25 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Mon, 22 Aug 2016 20:25:10 +0000 (13:25 -0700)
committer GitHub <noreply@github.com>
Mon, 22 Aug 2016 20:25:10 +0000 (13:25 -0700)
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/mon/PGMonitor.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Mon, 22 Aug 2016 20:25:10 +0000 (13:25 -0700)
committer	GitHub <noreply@github.com>
	Mon, 22 Aug 2016 20:25:10 +0000 (13:25 -0700)
		1	2
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history