]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit374c3c1d8cde50a4503cbd41ee2204aa6761557d
tree6bfba2e3a83dc0bf669542c2ba00eda5e58d21d6
parentadd1674c759f946c7c456e96e52b7ca1a45829ec
parent0830275b39afc408573c2c468fa3b0e7b1d5cc4e
Merge pull request #7917 from ceph/wip-10794-hammer

hammer: ceph-objectstore-tool, osd: Fix import handling

Reviewed-by: Loic Dachary <ldachary@redhat.com>
src/tools/ceph_objectstore_tool.cc