Code

Release 5.15 cherrypick#60

Code

Merged

huachaohuang merged 6 commits intotikv:release-5.15tikv/rocksdb:release-5.15from DorianZheng:release-5.15-cherrypickDorianZheng/rocksdb:release-5.15-cherrypickCopy head branch name to clipboardNov 13, 2018

+74-12

Commits

Commits on Oct 9, 2018

• [cherry-pick] Fix DBImpl::GetColumnFamilyHandleUnlocked race condition (facebook#4391)

  Show description for 0ce70fa
  DorianZheng

  committed
  0ce70fa

  Copy full SHA for 0ce70fa

• Merge branch 'release-5.15' of https://github.com/pingcap/rocksdb into release-5.15

  DorianZheng

  committed
  b2c8ae6

  Copy full SHA for b2c8ae6

Commits on Nov 13, 2018

• Merge branch 'release-5.15' of https://github.com/pingcap/rocksdb into release-5.15

  DorianZheng

  committed
  0b215bf

  Copy full SHA for 0b215bf

• Fix DBImpl::GetColumnFamilyHandleUnlocked data race (facebook#4666)

  Show description for 6d8d399
  DorianZheng

  committed
  6d8d399

  Copy full SHA for 6d8d399

• Fix CompactFiles bug (facebook#4665)

  Show description for c3201b6
  DorianZheng

  committed
  c3201b6

  Copy full SHA for c3201b6

• Fix RocksDB Lite build (facebook#4675)

  Show description for 128a23f
  

  sagar0

  authored and

  DorianZheng

  committed
  128a23f

  Copy full SHA for 128a23f