Merge remote-tracking branch 'gh/master' into hammer

author Sage Weil <sage@redhat.com>

Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)

committer Sage Weil <sage@redhat.com>

Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
author Sage Weil <sage@redhat.com>
Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
committer Sage Weil <sage@redhat.com>
Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
committer	Sage Weil <sage@redhat.com>
	Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history