From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 9 Feb 2017 09:31:05 +0000 (+0800)
Subject: Merge pull request #13306 from tchaikov/wip-18464
X-Git-Tag: v12.0.1~463
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f95627f2205ebf460f2772eab2784487e701461b;p=ceph.git

Merge pull request #13306 from tchaikov/wip-18464

rocksdb: sync with upstream

Reviewed-by: Nathan Cutler <ncutler@suse.com>
---

f95627f2205ebf460f2772eab2784487e701461b