]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: add1674 0830275)
Merge pull request #7917 from ceph/wip-10794-hammer
authorLoic Dachary <loic@dachary.org>
Wed, 6 Apr 2016 14:18:11 +0000 (16:18 +0200)
committerLoic Dachary <loic@dachary.org>
Wed, 6 Apr 2016 14:18:11 +0000 (16:18 +0200)
hammer: ceph-objectstore-tool, osd: Fix import handling

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/tools/ceph_objectstore_tool.cc patch | diff1 | diff2 | blob | history

diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.