Merge pull request #16400 from liewegas/wip-crush-rule-id

author Sage Weil <sage@newdream.net>

Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)

committer GitHub <noreply@github.com>

Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)
author Sage Weil <sage@newdream.net>
Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)
committer GitHub <noreply@github.com>
Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)
diff --cc src/test/cli/osdmaptool/create-print.t
Simple merge
diff --cc src/test/cli/osdmaptool/create-racks.t
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)
committer	GitHub <noreply@github.com>
	Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)
		1	2
src/test/cli/osdmaptool/create-print.t	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/osdmaptool/create-racks.t	patch \|	diff1 \|	diff2 \|	blob \| history