Merge pull request #12869 from athanatos/wip-18358

author Samuel Just <sjust@redhat.com>

Thu, 12 Jan 2017 20:46:00 +0000 (12:46 -0800)

committer GitHub <noreply@github.com>

Thu, 12 Jan 2017 20:46:00 +0000 (12:46 -0800)
author Samuel Just <sjust@redhat.com>
Thu, 12 Jan 2017 20:46:00 +0000 (12:46 -0800)
committer GitHub <noreply@github.com>
Thu, 12 Jan 2017 20:46:00 +0000 (12:46 -0800)
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Samuel Just <sjust@redhat.com>
	Thu, 12 Jan 2017 20:46:00 +0000 (12:46 -0800)
committer	GitHub <noreply@github.com>
	Thu, 12 Jan 2017 20:46:00 +0000 (12:46 -0800)
		1	2
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history