Merge pull request #550 from ceph/wip-6040

author athanatos <rexludorum@gmail.com>

Wed, 28 Aug 2013 21:10:37 +0000 (14:10 -0700)

committer athanatos <rexludorum@gmail.com>

Wed, 28 Aug 2013 21:10:37 +0000 (14:10 -0700)
author athanatos <rexludorum@gmail.com>
Wed, 28 Aug 2013 21:10:37 +0000 (14:10 -0700)
committer athanatos <rexludorum@gmail.com>
Wed, 28 Aug 2013 21:10:37 +0000 (14:10 -0700)
diff --cc src/osd/PGLog.cc
Simple merge
diff --cc src/osd/PGLog.h
Simple merge
author	athanatos <rexludorum@gmail.com>
	Wed, 28 Aug 2013 21:10:37 +0000 (14:10 -0700)
committer	athanatos <rexludorum@gmail.com>
	Wed, 28 Aug 2013 21:10:37 +0000 (14:10 -0700)
		1	2
src/osd/PGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.h	patch \|	diff1 \|	diff2 \|	blob \| history