]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit09c11071f8788b552355f7b24d07a4219afab4c4
treeee4efcec53a4cad94831baa63804bf01a289e257
parent07038a79f37cb12d4f00683d012402b34f8633ce
parent2dc29deb2ea2d1342edfdd2cd7c682360769d548
Merge pull request #3246 from ceph/wip-9780-9781

ceph-objectstore-tool import/export and related fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
src/osd/OSD.cc
src/osd/PG.cc
src/osd/ReplicatedPG.cc