]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14456 from tchaikov/wip-rocksdb-freebsd-build
authorKefu Chai <tchaikov@gmail.com>
Tue, 18 Apr 2017 15:17:03 +0000 (23:17 +0800)
committerGitHub <noreply@github.com>
Tue, 18 Apr 2017 15:17:03 +0000 (23:17 +0800)
rocksdb: sync with upstream

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

Trivial merge