From c6fc1db6981733c8bfe90d979132b00cfc03b83b Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Thu, 27 Feb 2020 10:18:01 -0800
Subject: [PATCH] chore: prepare v0.2.12 release (#2278)

Also includes `tokio-macros` v0.2.5.
---
 tokio-macros/CHANGELOG.md |  5 +++++
 tokio-macros/Cargo.toml   |  4 ++--
 tokio-macros/src/lib.rs   |  2 +-
 tokio/CHANGELOG.md        | 27 +++++++++++++++++++++++++++
 tokio/Cargo.toml          |  4 ++--
 tokio/src/lib.rs          |  2 +-
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/tokio-macros/CHANGELOG.md b/tokio-macros/CHANGELOG.md
index 91955c7abda..d9edc5d2e32 100644
--- a/tokio-macros/CHANGELOG.md
+++ b/tokio-macros/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.2.5 (February 27, 2019)
+
+### Fixed
+- doc improvements (#2225).
+
 # 0.2.4 (January 27, 2019)
 
 ### Fixed
diff --git a/tokio-macros/Cargo.toml b/tokio-macros/Cargo.toml
index 01bfdc2816b..27092128a22 100644
--- a/tokio-macros/Cargo.toml
+++ b/tokio-macros/Cargo.toml
@@ -7,13 +7,13 @@ name = "tokio-macros"
 #   - Cargo.toml
 # - Update CHANGELOG.md.
 # - Create "v0.1.x" git tag.
-version = "0.2.4"
+version = "0.2.5"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-macros/0.2.3/tokio_macros"
+documentation = "https://docs.rs/tokio-macros/0.2.5/tokio_macros"
 description = """
 Tokio's proc macros.
 """
diff --git a/tokio-macros/src/lib.rs b/tokio-macros/src/lib.rs
index bc8f203aceb..9fdfb5bd769 100644
--- a/tokio-macros/src/lib.rs
+++ b/tokio-macros/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio-macros/0.2.3")]
+#![doc(html_root_url = "https://docs.rs/tokio-macros/0.2.5")]
 #![allow(clippy::needless_doctest_main)]
 #![warn(
     missing_debug_implementations,
diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index 91a4670a659..ed785082fe5 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,3 +1,30 @@
+# 0.2.12 (February 27, 2019)
+
+### Fixes
+- net: `UnixStream::poll_shutdown` should call `shutdown(Write)` (#2245).
+- process: Wake up read and write on `EPOLLERR` (#2218).
+- rt: potential deadlock when using `block_in_place` and shutting down the
+  runtime (#2119).
+- rt: only detect number of CPUs if `core_threads` not specified (#2238).
+- sync: reduce `watch::Receiver` struct size (#2191).
+- time: succeed when setting delay of `$MAX-1` (#2184).
+- time: avoid having to poll `DelayQueue` after inserting new delay (#2217).
+
+### Added
+- macros: `pin!` variant that assigns to identifier and pins (#2274).
+- net: impl `Stream` for `Listener` types (#2275).
+- rt: `Runtime::shutdown_timeout` waits for runtime to shutdown for specified
+  duration (#2186).
+- stream: `StreamMap` merges streams and can insert / remove streams at
+  runtime (#2185).
+- stream: `StreamExt::skip()` skips a fixed number of items (#2204).
+- stream: `StreamExt::skip_while()` skips items based on a predicate (#2205).
+- sync: `Notify` provides basic `async` / `await` task notification (#2210).
+- sync: `Mutex::into_inner` retrieves guarded data (#2250).
+- sync: `mpsc::Sender::send_timeout` sends, waiting for up to specified duration
+  for channel capacity (#2227).
+- time: impl `Ord` and `Hash` for `Instant` (#2239).
+
 # 0.2.11 (January 27, 2019)
 
 ### Fixes
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 1a3167d38d4..20f68c39c5f 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -8,12 +8,12 @@ name = "tokio"
 #   - README.md
 # - Update CHANGELOG.md.
 # - Create "v0.2.x" git tag.
-version = "0.2.11"
+version = "0.2.12"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 readme = "README.md"
-documentation = "https://docs.rs/tokio/0.2.11/tokio/"
+documentation = "https://docs.rs/tokio/0.2.12/tokio/"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
 description = """
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 036d10369b2..043c352209e 100644
--- a/tokio/src/lib.rs
+++ b/tokio/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio/0.2.11")]
+#![doc(html_root_url = "https://docs.rs/tokio/0.2.12")]
 #![allow(
     clippy::cognitive_complexity,
     clippy::large_enum_variant,