]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21548 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 18 May 2018 21:31:18 +0000 (14:31 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 18 May 2018 21:31:18 +0000 (14:31 -0700)
* refs/pull/21548/head:
osdc/Objecter: apply throttle on enumerate_objects.

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/osdc/Objecter.cc

Simple merge