Merge pull request #5545 from ceph/wip-objclass-filters

author John Spray <jcspray@gmail.com>

Thu, 27 Aug 2015 17:14:37 +0000 (18:14 +0100)

committer John Spray <jcspray@gmail.com>

Thu, 27 Aug 2015 17:14:37 +0000 (18:14 +0100)
author John Spray <jcspray@gmail.com>
Thu, 27 Aug 2015 17:14:37 +0000 (18:14 +0100)
committer John Spray <jcspray@gmail.com>
Thu, 27 Aug 2015 17:14:37 +0000 (18:14 +0100)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	John Spray <jcspray@gmail.com>
	Thu, 27 Aug 2015 17:14:37 +0000 (18:14 +0100)
committer	John Spray <jcspray@gmail.com>
	Thu, 27 Aug 2015 17:14:37 +0000 (18:14 +0100)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history