]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9039ab3 390f2cc)
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)
commit4b52418ccbe7bbb7c036f15897d4a22984e98836
tree425042ae700ff7aca2303a12d5d1176570eee815tree | snapshot
parent9039ab3bfaa20479e1442f3df5e56ee790a32f70commit | diff
parent390f2ccd3d93d4cca8437e3e4bca7c644aca685dcommit | diff
Merge PR #21548 into master

* 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>
src/osdc/Objecter.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.