From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 15 Sep 2017 17:23:56 +0000 (+0800)
Subject: Merge pull request #17388 from tchaikov/wip-rocksdb
X-Git-Tag: v13.0.1~903
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75922203337deec1ffd9eaf8993bfbfb356967b9;p=ceph.git

Merge pull request #17388 from tchaikov/wip-rocksdb

rocksdb: sync with upstream

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

75922203337deec1ffd9eaf8993bfbfb356967b9