Merge branch 'wip-da-SCA-20141025'

author Sage Weil <sage@redhat.com>

Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)

committer Sage Weil <sage@redhat.com>

Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
author Sage Weil <sage@redhat.com>
Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
committer Sage Weil <sage@redhat.com>
Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/PGLog.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
committer	Sage Weil <sage@redhat.com>
	Mon, 27 Oct 2014 19:44:34 +0000 (12:44 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history