From 92a8aba610997dfa415738b6fc3cb641f074c900 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean@seanmonstar.com>
Date: Tue, 20 Nov 2018 12:55:08 -0800
Subject: [PATCH] v0.12.15

---
 CHANGELOG.md | 9 +++++++++
 Cargo.toml   | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed41199..18f32845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+### v0.12.15 (2018-11-20)
+
+
+#### Features
+
+* **client:** add client::conn::Builder::executor method ([95446cc3](https://github.com/hyperium/hyper/commit/95446cc338f8055539dd3503c482d649f42a531c))
+* **server:** change `NewService` to `MakeService` with connection context ([30870029](https://github.com/hyperium/hyper/commit/30870029b9eb162f566d8dddd007fb6df9cd69af), closes [#1650](https://github.com/hyperium/hyper/issues/1650))
+
+
 ### v0.12.14 (2018-11-07)
 
 
diff --git a/Cargo.toml b/Cargo.toml
index 50af3ddd..7bc51f0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hyper"
-version = "0.12.14" # don't forget to update html_root_url
+version = "0.12.15" # don't forget to update html_root_url
 description = "A fast and correct HTTP library."
 readme = "README.md"
 homepage = "https://hyper.rs"
diff --git a/src/lib.rs b/src/lib.rs
index d8240eaa..5dd450ba 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/hyper/0.12.14")]
+#![doc(html_root_url = "https://docs.rs/hyper/0.12.15")]
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 #![cfg_attr(test, deny(warnings))]