]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1418886 05d79fa)
Merge pull request #6976 from dzafman/wip-13862
authorSage Weil <sage@redhat.com>
Thu, 21 Jan 2016 15:50:46 +0000 (10:50 -0500)
committerSage Weil <sage@redhat.com>
Thu, 21 Jan 2016 15:50:46 +0000 (10:50 -0500)
osd: fix temp object removal after upgrade

http://pulpito.ceph.com/sage-2016-01-20_17:01:32-upgrade:hammer-x-wip-sage-testing---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/PGBackend.cc patch | diff1 | diff2 | blob | history

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