From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 18 Apr 2017 15:17:03 +0000 (+0800)
Subject: Merge pull request #14456 from tchaikov/wip-rocksdb-freebsd-build
X-Git-Tag: v12.0.2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1ba579a7c25466b93e45f275e5ec920ccf67cd5;p=ceph.git

Merge pull request #14456 from tchaikov/wip-rocksdb-freebsd-build

rocksdb: sync with upstream

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

c1ba579a7c25466b93e45f275e5ec920ccf67cd5