Merge pull request #5299 from hjwsm1989/pgmonitor-const

author Loic Dachary <loic@dachary.org>

Tue, 1 Sep 2015 23:03:14 +0000 (01:03 +0200)

committer Loic Dachary <loic@dachary.org>

Tue, 1 Sep 2015 23:03:14 +0000 (01:03 +0200)
author Loic Dachary <loic@dachary.org>
Tue, 1 Sep 2015 23:03:14 +0000 (01:03 +0200)
committer Loic Dachary <loic@dachary.org>
Tue, 1 Sep 2015 23:03:14 +0000 (01:03 +0200)
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/mon/PaxosService.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Tue, 1 Sep 2015 23:03:14 +0000 (01:03 +0200)
committer	Loic Dachary <loic@dachary.org>
	Tue, 1 Sep 2015 23:03:14 +0000 (01:03 +0200)
		1	2
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PaxosService.h	patch \|	diff1 \|	diff2 \|	blob \| history