Merge branch 'master' of https://github.com/tikv/tikv into fix-test

Signed-off-by: Yu Juncen <yujuncen@pingcap.com>
WangLe1321 · May 14, 2022 · 3fec0d7 · 3fec0d7
2 parents ef44a4d + de208b5
commit 3fec0d7
Show file tree

Hide file tree

Showing 15 changed files with 969 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tikv"
-version = "6.0.0-alpha"
+version = "6.1.0-alpha"
 authors = ["The TiKV Authors"]
 description = "A distributed transactional key-value database powered by Rust and Raft"
 license = "Apache-2.0"

diff --git a/components/backup-stream/Cargo.toml b/components/backup-stream/Cargo.toml
@@ -54,6 +54,7 @@ tokio-stream = "0.1"
 tokio-util = { version = "0.7", features = ["compat"] } 
 txn_types = { path = "../txn_types", default-features = false }
 uuid = "0.8"
+yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }
 
 [dev-dependencies]
 async-trait = "0.1"