Merge pull request #1738 from ceph/wip-8147

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

Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)

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

Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)
author Samuel Just <sam.just@inktank.com>
Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)
committer Samuel Just <sam.just@inktank.com>
Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history