Merge pull request #16569 from liewegas/wip-set-not-put

author Sage Weil <sage@newdream.net>

Thu, 27 Jul 2017 16:34:37 +0000 (11:34 -0500)

committer GitHub <noreply@github.com>

Thu, 27 Jul 2017 16:34:37 +0000 (11:34 -0500)
author Sage Weil <sage@newdream.net>
Thu, 27 Jul 2017 16:34:37 +0000 (11:34 -0500)
committer GitHub <noreply@github.com>
Thu, 27 Jul 2017 16:34:37 +0000 (11:34 -0500)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 27 Jul 2017 16:34:37 +0000 (11:34 -0500)
committer	GitHub <noreply@github.com>
	Thu, 27 Jul 2017 16:34:37 +0000 (11:34 -0500)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history