]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07038a7 2dc29de)
Merge pull request #3246 from ceph/wip-9780-9781
authorSamuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
ceph-objectstore-tool import/export and related fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.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/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.