From: Sage Weil <sage@newdream.net>
Date: Tue, 25 Apr 2017 14:43:56 +0000 (-0500)
Subject: Merge pull request #14718 from liewegas/wip-bluestore-tool
X-Git-Tag: v12.0.3~259
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d31587d41836e632ef0ebc5d1f287f3529125a7;p=ceph.git

Merge pull request #14718 from liewegas/wip-bluestore-tool

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>
---

0d31587d41836e632ef0ebc5d1f287f3529125a7
diff --cc src/CMakeLists.txt
index ea928d76f17a,910420914ae9..ff070cda8f37
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -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