From: Yueh-Hsuan Chiang <yhchiang@fb.com>
Date: Thu, 30 Oct 2014 06:43:58 +0000 (-0700)
Subject: Merge branch '3.6.fb' of github.com:facebook/rocksdb into fix36-dyopt
X-Git-Tag: rocksdb-3.6.2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f96bb67e5e1b7a003e131bf5057d29b8ad3a162e;p=rocksdb.git

Merge branch '3.6.fb' of github.com:facebook/rocksdb into fix36-dyopt
---

f96bb67e5e1b7a003e131bf5057d29b8ad3a162e