Merge pull request #14046 from songbaisen/m7

author John Spray <jspray@redhat.com>

Mon, 17 Apr 2017 10:23:22 +0000 (11:23 +0100)

committer GitHub <noreply@github.com>

Mon, 17 Apr 2017 10:23:22 +0000 (11:23 +0100)
author John Spray <jspray@redhat.com>
Mon, 17 Apr 2017 10:23:22 +0000 (11:23 +0100)
committer GitHub <noreply@github.com>
Mon, 17 Apr 2017 10:23:22 +0000 (11:23 +0100)
diff --cc src/mgr/ClusterState.cc
Simple merge
diff --cc src/mon/PGMap.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Mon, 17 Apr 2017 10:23:22 +0000 (11:23 +0100)
committer	GitHub <noreply@github.com>
	Mon, 17 Apr 2017 10:23:22 +0000 (11:23 +0100)
		1	2
src/mgr/ClusterState.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history