Merge pull request #9394 from xiexingguo/xxg-wip-batchpgstates

author Kefu Chai <tchaikov@gmail.com>

Mon, 4 Jul 2016 12:19:20 +0000 (20:19 +0800)

committer GitHub <noreply@github.com>

Mon, 4 Jul 2016 12:19:20 +0000 (20:19 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 4 Jul 2016 12:19:20 +0000 (20:19 +0800)
committer GitHub <noreply@github.com>
Mon, 4 Jul 2016 12:19:20 +0000 (20:19 +0800)
diff --cc src/mon/PGMap.cc
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 4 Jul 2016 12:19:20 +0000 (20:19 +0800)
committer	GitHub <noreply@github.com>
	Mon, 4 Jul 2016 12:19:20 +0000 (20:19 +0800)
		1	2
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history