Merge pull request #2332 from ceph/wip-8231-forreview

author Samuel Just <sam.just@inktank.com>

Thu, 28 Aug 2014 23:37:37 +0000 (16:37 -0700)

committer Samuel Just <sam.just@inktank.com>

Thu, 28 Aug 2014 23:37:37 +0000 (16:37 -0700)
author Samuel Just <sam.just@inktank.com>
Thu, 28 Aug 2014 23:37:37 +0000 (16:37 -0700)
committer Samuel Just <sam.just@inktank.com>
Thu, 28 Aug 2014 23:37:37 +0000 (16:37 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 28 Aug 2014 23:37:37 +0000 (16:37 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 28 Aug 2014 23:37:37 +0000 (16:37 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history