Merge pull request #17029 from xiexingguo/wip-crush-rule-rename

author Sage Weil <sage@newdream.net>

Fri, 25 Aug 2017 15:21:38 +0000 (10:21 -0500)

committer GitHub <noreply@github.com>

Fri, 25 Aug 2017 15:21:38 +0000 (10:21 -0500)
author Sage Weil <sage@newdream.net>
Fri, 25 Aug 2017 15:21:38 +0000 (10:21 -0500)
committer GitHub <noreply@github.com>
Fri, 25 Aug 2017 15:21:38 +0000 (10:21 -0500)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 25 Aug 2017 15:21:38 +0000 (10:21 -0500)
committer	GitHub <noreply@github.com>
	Fri, 25 Aug 2017 15:21:38 +0000 (10:21 -0500)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history