From 5285656bdc7baa3a2aaedf3985083a23c1009bfc Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sun, 3 Jan 2021 04:39:37 +0000 Subject: [PATCH] prepare next beta releases --- actix-codec/CHANGES.md | 2 +- actix-router/CHANGES.md | 2 +- actix-rt/CHANGES.md | 2 +- actix-server/CHANGES.md | 10 ++++++++-- actix-server/Cargo.toml | 4 ++-- actix-service/CHANGES.md | 6 +++++- actix-service/Cargo.toml | 2 +- actix-tls/CHANGES.md | 6 ++++++ actix-tls/Cargo.toml | 6 +++--- actix-tracing/Cargo.toml | 2 +- actix-utils/CHANGES.md | 2 +- actix-utils/Cargo.toml | 2 +- bytestring/CHANGES.md | 2 +- 13 files changed, 32 insertions(+), 16 deletions(-) diff --git a/actix-codec/CHANGES.md b/actix-codec/CHANGES.md index 0c26c085..f6102cbf 100644 --- a/actix-codec/CHANGES.md +++ b/actix-codec/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased - 2020-xx-xx +## Unreleased - 2021-xx-xx ## 0.4.0-beta.1 - 2020-12-28 diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md index bb148c87..85ac7a78 100644 --- a/actix-router/CHANGES.md +++ b/actix-router/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased - 2020-xx-xx +## Unreleased - 2021-xx-xx ## 0.2.5 - 2020-09-20 diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index 35409616..ec12e569 100644 --- a/actix-rt/CHANGES.md +++ b/actix-rt/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased - 2020-xx-xx +## Unreleased - 2021-xx-xx ## 2.0.0-beta.1 - 2020-12-28 diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index f3b7c93c..d02643e6 100644 --- a/actix-server/CHANGES.md +++ b/actix-server/CHANGES.md @@ -1,7 +1,13 @@ # Changes -## Unreleased - 2020-xx-xx -* Merge `actix-testing` to `actix-server` as `test_server` mod. +## Unreleased - 2021-xx-xx + + +## 2.0.0-beta.2 - 2021-01-03 +* Merge `actix-testing` to `actix-server` as `test_server` mod. [#242] + +[#242]: https://github.com/actix/actix-net/pull/242 + ## 2.0.0-beta.1 - 2020-12-28 * Added explicit info log message on accept queue pause. [#215] diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index 0bdd5d23..2ceeaa21 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-server" -version = "2.0.0-beta.1" +version = "2.0.0-beta.2" authors = [ "Nikolay Kim ", "fakeshadow <24548779@qq.com>", @@ -25,7 +25,7 @@ default = [] [dependencies] actix-codec = "0.4.0-beta.1" actix-rt = "2.0.0-beta.1" -actix-service = "2.0.0-beta.1" +actix-service = "2.0.0-beta.2" actix-utils = "3.0.0-beta.1" futures-core = { version = "0.3.7", default-features = false } diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index 1cbf414e..bff9bda5 100644 --- a/actix-service/CHANGES.md +++ b/actix-service/CHANGES.md @@ -1,6 +1,10 @@ # Changes -## Unreleased - 2020-xx-xx +## Unreleased - 2021-xx-xx + + +## 2.0.0-beta.2 - 2021-01-03 +* Remove redundant type parameter from `map_config`. ## 2.0.0-beta.1 - 2020-12-28 diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml index 708fb5e6..869881e9 100644 --- a/actix-service/Cargo.toml +++ b/actix-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-service" -version = "2.0.0-beta.1" +version = "2.0.0-beta.2" authors = [ "Nikolay Kim ", "Rob Ede ", diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index dcb477d8..1a7ef7a7 100644 --- a/actix-tls/CHANGES.md +++ b/actix-tls/CHANGES.md @@ -3,6 +3,12 @@ ## Unreleased - 2021-xx-xx +## 3.0.0-beta.2 - 2021-xx-xx +* Depend on stable trust-dns packages. [#204] + +[#204]: https://github.com/actix/actix-net/pull/204 + + ## 3.0.0-beta.1 - 2020-12-29 * Move acceptors under `accept` module. [#238] * Merge `actix-connect` crate under `connect` module. [#238] diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 017f17fe..cfd6960a 100644 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-tls" -version = "3.0.0-beta.1" +version = "3.0.0-beta.2" authors = ["Nikolay Kim "] description = "TLS acceptor and connector services for Actix ecosystem" keywords = ["network", "tls", "ssl", "async", "transport"] @@ -46,7 +46,7 @@ uri = ["http"] [dependencies] actix-codec = "0.4.0-beta.1" actix-rt = "2.0.0-beta.1" -actix-service = "2.0.0-beta.1" +actix-service = "2.0.0-beta.2" actix-utils = "3.0.0-beta.1" derive_more = "0.99.5" @@ -76,7 +76,7 @@ tls-native-tls = { package = "native-tls", version = "0.2", optional = true } tokio-native-tls = { version = "0.3", optional = true } [dev-dependencies] -actix-server = "2.0.0-beta.1" +actix-server = "2.0.0-beta.2" bytes = "1" env_logger = "0.8" futures-util = { version = "0.3.7", default-features = false, features = ["sink"] } diff --git a/actix-tracing/Cargo.toml b/actix-tracing/Cargo.toml index 720e7ad5..547f2d16 100644 --- a/actix-tracing/Cargo.toml +++ b/actix-tracing/Cargo.toml @@ -16,7 +16,7 @@ name = "actix_tracing" path = "src/lib.rs" [dependencies] -actix-service = "2.0.0-beta.1" +actix-service = "2.0.0-beta.2" futures-util = { version = "0.3.4", default-features = false } tracing = "0.1" diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md index 6c7025b5..2504f012 100644 --- a/actix-utils/CHANGES.md +++ b/actix-utils/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased - 2020-xx-xx +## Unreleased - 2021-xx-xx ## 3.0.0-beta.1 - 2020-12-28 diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml index 3dded4f0..aab17fca 100644 --- a/actix-utils/Cargo.toml +++ b/actix-utils/Cargo.toml @@ -18,7 +18,7 @@ path = "src/lib.rs" [dependencies] actix-codec = "0.4.0-beta.1" actix-rt = "2.0.0-beta.1" -actix-service = "2.0.0-beta.1" +actix-service = "2.0.0-beta.2" futures-core = { version = "0.3.7", default-features = false } futures-sink = { version = "0.3.7", default-features = false } diff --git a/bytestring/CHANGES.md b/bytestring/CHANGES.md index 90b32769..217eb8d0 100644 --- a/bytestring/CHANGES.md +++ b/bytestring/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased - 2020-xx-xx +## Unreleased - 2021-xx-xx ## 1.0.0 - 2020-12-31