]> 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: 5b41a65 93fd56e)
Merge PR #20484 into master
authorSage Weil <sage@redhat.com>
Wed, 21 Feb 2018 16:23:33 +0000 (10:23 -0600)
committerSage Weil <sage@redhat.com>
Wed, 21 Feb 2018 16:23:33 +0000 (10:23 -0600)
commit9f5a7ca8bf8fd94ee506c5fa3a8403e8664aff9a
treea8396e2f039719689ed050810ffa49430d56f28dtree | snapshot
parent5b41a65d2ddc33f444c115c9a39f896acaf7ebe1commit | diff
parent93fd56ed039363c4f169259a0a560b968d1a0333commit | diff
Merge PR #20484 into master

* refs/pull/20484/head:
osd/PrimaryLogPG: cancel all objecter ops atomically
osdc/Objecter: allow multiple ops to be canceled atomically

Reviewed-by: David Zafman <dzafman@redhat.com>
src/osd/PrimaryLogPG.cc diff1 | diff2 | blob | history
src/osd/PrimaryLogPG.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.