]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f3cf00 2428f50)
Merge PR #25622 into master
authorSage Weil <sage@redhat.com>
Thu, 20 Dec 2018 03:23:26 +0000 (21:23 -0600)
committerSage Weil <sage@redhat.com>
Thu, 20 Dec 2018 03:23:26 +0000 (21:23 -0600)
* refs/pull/25622/head:
Objecter.cc: make op resend logic more readable

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/osdc/Objecter.cc patch | diff1 | diff2 | blob | history

diff --cc src/osdc/Objecter.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.