Merge pull request #4804 from athanatos/wip-11771

author Sage Weil <sage@redhat.com>

Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)

committer Sage Weil <sage@redhat.com>

Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)
author Sage Weil <sage@redhat.com>
Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)
committer Sage Weil <sage@redhat.com>
Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)
		1	2
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history