Merge pull request #5686 from liewegas/wip-hammer-feature

author Sage Weil <sage@redhat.com>

Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)

committer Sage Weil <sage@redhat.com>

Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
author Sage Weil <sage@redhat.com>
Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
committer Sage Weil <sage@redhat.com>
Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
committer	Sage Weil <sage@redhat.com>
	Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history