Merge pull request #8051 from xiaoxichen/wip-15024-hammer

author Sage Weil <sage@redhat.com>

Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)
author Sage Weil <sage@redhat.com>
Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history