]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f1dd10 d296120)
Merge pull request #5062 from SUSE/wip-11699-firefly
authorJosh Durgin <jdurgin@redhat.com>
Tue, 21 Jul 2015 20:31:33 +0000 (13:31 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 21 Jul 2015 20:31:33 +0000 (13:31 -0700)
objecter: resend linger ops on split

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osdc/Objecter.cc patch | diff1 | diff2 | blob | history
src/osdc/Objecter.h patch | diff1 | diff2 | blob | history

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