Merge pull request #5518 from ceph/wip-12652

author Sage Weil <sage@redhat.com>

Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)
author Sage Weil <sage@redhat.com>
Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)
diff --cc src/osd/PGLog.cc
Simple merge
diff --cc src/osd/PGLog.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)
		1	2
src/osd/PGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.h	patch \|	diff1 \|	diff2 \|	blob \| history