]> 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: 6e3b6f0 496e561)
Merge pull request #2918 from ceph/wip-9113-9487-dumpling
authorSage Weil <sage@redhat.com>
Mon, 24 Nov 2014 18:18:48 +0000 (10:18 -0800)
committerSage Weil <sage@redhat.com>
Mon, 24 Nov 2014 18:18:48 +0000 (10:18 -0800)
dumpling snap trimming

Tested-by: Dan Van Der Ster <daniel.vanderster@cern.ch>
1  2 
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h patch | diff1 | diff2 | blob | history

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