Skip to content

Commit 77b9754

Browse files
author
Dave Rigby
committed
Revert to original upstream tklv/rocksdb fork (tikv/6.29)
For the underlying rocksdb repo (not the rust-rocksdb Rust bindings), there is no longer any difference between our fork (6.29.tikv-ingest_external_files) and TiKV's branch we forked from: ``` ❯ git diff 20225a41c..arthurprs/6.29.tikv-ingest_external_files <EOF> ``` Change back to the original branch, and pin to the last merged tikv/6.29 SHA (20225a41c).
1 parent 6a5ed8b commit 77b9754

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "rocksdb"]
22
path = librocksdb_sys/rocksdb
3-
url = https://github.com/arthurprs/rocksdb.git
4-
branch = 6.29.tikv-ingest_external_files
3+
url = https://github.com/tikv/rocksdb.git
4+
branch = 6.29.tikv
55

66
[submodule "titan"]
77
path = librocksdb_sys/libtitan_sys/titan

librocksdb_sys/rocksdb

0 commit comments

Comments
 (0)