From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 17 Feb 2016 23:49:51 +0000 (-0800)
Subject: Merge branch 'wip-sharded-scan' of git://github.com/jcsp/ceph into greg-pr-7034
X-Git-Tag: v10.1.0~366^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=493a073e99073acc5b37247d21f34cd61bb44919;p=ceph.git

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

Conflicts:
	src/osdc/Objecter.cc
---

493a073e99073acc5b37247d21f34cd61bb44919