]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
src/osd/PrimaryLogPG.cc patch | diff1 | diff2 | blob | history
src/osd/PrimaryLogPG.h patch | diff1 | diff2 | blob | history

diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.