Merge remote-tracking branch 'gh/hammer'

author Sage Weil <sage@redhat.com>

Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)

committer Sage Weil <sage@redhat.com>

Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)
author Sage Weil <sage@redhat.com>
Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)
committer Sage Weil <sage@redhat.com>
Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)
committer	Sage Weil <sage@redhat.com>
	Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history