Merge pull request #5630 from wonzhq/evict-after-flush

author Sage Weil <sage@redhat.com>

Thu, 31 Dec 2015 14:33:26 +0000 (09:33 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 31 Dec 2015 14:33:26 +0000 (09:33 -0500)
author Sage Weil <sage@redhat.com>
Thu, 31 Dec 2015 14:33:26 +0000 (09:33 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 31 Dec 2015 14:33:26 +0000 (09:33 -0500)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 31 Dec 2015 14:33:26 +0000 (09:33 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 31 Dec 2015 14:33:26 +0000 (09:33 -0500)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history