Merge remote-tracking branch 'gh/giant'

author Sage Weil <sage@redhat.com>

Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)

committer Sage Weil <sage@redhat.com>

Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)
author Sage Weil <sage@redhat.com>
Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)
committer Sage Weil <sage@redhat.com>
Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)
committer	Sage Weil <sage@redhat.com>
	Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history