diff --git a/CHANGELOG.md b/CHANGELOG.md index c1e9f0d1642..cc18abdf83b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project are documented in this file. See also [TiDB Changelog](https://github.com/pingcap/tidb/blob/master/CHANGELOG.md) and [PD Changelog](https://github.com/pingcap/pd/blob/master/CHANGELOG.md). +## [2.0.11] +### Bug Fixes +* Fix two issues about Region merge [#4003](https://github.com/tikv/tikv/pull/4003) and [#4004](https://github.com/tikv/tikv/pull/4004) + ## [2.0.10] ### Bug Fixes * Avoid transferring the leader to a newly created peer, to optimize the possible delay [#3929](https://github.com/tikv/tikv/pull/3929) diff --git a/Cargo.lock b/Cargo.lock index 5c90c54f2e9..0e346b3a270 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1273,7 +1273,7 @@ dependencies = [ [[package]] name = "tikv" -version = "2.0.10" +version = "2.0.11" dependencies = [ "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1330,7 +1330,7 @@ name = "tikv-fuzz" version = "0.0.1" dependencies = [ "libfuzzer-sys 0.1.0 (git+https://github.com/rust-fuzz/libfuzzer-sys.git)", - "tikv 2.0.10", + "tikv 2.0.11", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 49fe0b6c608..ebbff28e742 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tikv" -version = "2.0.10" +version = "2.0.11" keywords = ["KV", "distributed-systems", "raft"] build = "build.rs"