Merge pull request #7094 from songbaisen/wipdf

author Sage Weil <sage@redhat.com>

Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)

committer Sage Weil <sage@redhat.com>

Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)
author Sage Weil <sage@redhat.com>
Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)
committer Sage Weil <sage@redhat.com>
Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/mon/PGMonitor.h
Simple merge
diff --cc src/test/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)
		1	2
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history