From: Anurag Indu <aindu@aindu-mbp.local>
Date: Wed, 25 Mar 2015 00:00:41 +0000 (-0700)
Subject: Merge branch 'master' of github.com:facebook/rocksdb
X-Git-Tag: v3.10~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=986bdc68012c7830f36164fb5516af226e1e8adf;p=rocksdb.git

Merge branch 'master' of github.com:facebook/rocksdb
---

986bdc68012c7830f36164fb5516af226e1e8adf