]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14718 from liewegas/wip-bluestore-tool
authorSage Weil <sage@newdream.net>
Tue, 25 Apr 2017 14:43:56 +0000 (09:43 -0500)
committerGitHub <noreply@github.com>
Tue, 25 Apr 2017 14:43:56 +0000 (09:43 -0500)
ceph-kvstore-tool: allow 'bluestore-kv' as kvdb type; add escaping, compaction

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
1  2 
src/CMakeLists.txt
src/os/bluestore/BlueStore.cc

index ea928d76f17a06a7d7440af05b233fef9b06e960,910420914ae98d4bbb5db9b94c9dca46efdcb90b..ff070cda8f37b2fbd07ce1606ce9d54a4f4a393a
@@@ -396,8 -396,10 +396,9 @@@ set(libcommon_file
    common/admin_socket_client.cc
    common/bloom_filter.cc
    common/Readahead.cc
 -  ${crush_srcs}
    common/cmdparse.cc
    common/escape.c
+   common/url_escape.cc
    common/io_priority.cc
    common/Clock.cc
    common/ceph_time.cc
Simple merge