Merge pull request #6143 from dachary/wip-13340-hammer

author Loic Dachary <loic@dachary.org>

Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)

committer Loic Dachary <loic@dachary.org>

Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)
author Loic Dachary <loic@dachary.org>
Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)
committer Loic Dachary <loic@dachary.org>
Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)
committer	Loic Dachary <loic@dachary.org>
	Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)
		1	2
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history