Merge pull request #7438 from ifed01/wip-pgbackend-cleanup

author Sage Weil <sage@redhat.com>

Tue, 2 Feb 2016 16:03:51 +0000 (11:03 -0500)

committer Sage Weil <sage@redhat.com>

Tue, 2 Feb 2016 16:03:51 +0000 (11:03 -0500)
author Sage Weil <sage@redhat.com>
Tue, 2 Feb 2016 16:03:51 +0000 (11:03 -0500)
committer Sage Weil <sage@redhat.com>
Tue, 2 Feb 2016 16:03:51 +0000 (11:03 -0500)
diff --cc src/osd/ECTransaction.h
Simple merge
diff --cc src/osd/PGBackend.h
Simple merge
diff --cc src/osd/ReplicatedBackend.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 2 Feb 2016 16:03:51 +0000 (11:03 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 2 Feb 2016 16:03:51 +0000 (11:03 -0500)
		1	2
src/osd/ECTransaction.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history