Merge branch 'wip-sharded-scan' of git://github.com/jcsp/ceph into greg-pr-7034

author Greg Farnum <gfarnum@redhat.com>

Wed, 17 Feb 2016 23:49:51 +0000 (15:49 -0800)

committer Greg Farnum <gfarnum@redhat.com>

Wed, 17 Feb 2016 23:49:51 +0000 (15:49 -0800)
author Greg Farnum <gfarnum@redhat.com>
Wed, 17 Feb 2016 23:49:51 +0000 (15:49 -0800)
committer Greg Farnum <gfarnum@redhat.com>
Wed, 17 Feb 2016 23:49:51 +0000 (15:49 -0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Greg Farnum <gfarnum@redhat.com>
	Wed, 17 Feb 2016 23:49:51 +0000 (15:49 -0800)
committer	Greg Farnum <gfarnum@redhat.com>
	Wed, 17 Feb 2016 23:49:51 +0000 (15:49 -0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history