Merge remote-tracking branch 'upstream/next'

author Samuel Just <sjust@redhat.com>

Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)

committer Samuel Just <sjust@redhat.com>

Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
author Samuel Just <sjust@redhat.com>
Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
committer Samuel Just <sjust@redhat.com>
Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
committer	Samuel Just <sjust@redhat.com>
	Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history