From: Sage Weil <sage@redhat.com>
Date: Fri, 3 Jun 2016 14:41:35 +0000 (-0400)
Subject: Merge pull request #9466 from liewegas/wip-rocksdb
X-Git-Tag: v11.0.0~327
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f485596dd0656b01ba130b4e5040fcd4c02d1a31;p=ceph.git

Merge pull request #9466 from liewegas/wip-rocksdb

rocksdb: pull up to latest master
---

f485596dd0656b01ba130b4e5040fcd4c02d1a31