From cd95979ed7ea163489e5c81c4239d08f1b56df09 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 22 Feb 2018 18:03:06 +0100
Subject: [PATCH 1/2] fix blocking-io-dispatcher setting, #24357

It must still have a valid value becuase used from Akka HTTP.
---
 akka-stream/src/main/resources/reference.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/akka-stream/src/main/resources/reference.conf b/akka-stream/src/main/resources/reference.conf
index 6d1bc2fe22..52d66ae5ff 100644
--- a/akka-stream/src/main/resources/reference.conf
+++ b/akka-stream/src/main/resources/reference.conf
@@ -115,7 +115,8 @@ akka {
 
     # Deprecated, use akka.stream.materializer.blocking-io-dispatcher, this setting
     # was never applied because of bug #24357
-    blocking-io-dispatcher = "<deprecated>"
+    # It must still have a valid value becuase used from Akka HTTP.
+    blocking-io-dispatcher = "akka.stream.default-blocking-io-dispatcher"
 
     default-blocking-io-dispatcher {
       type = "Dispatcher"

From 8a662bdc2485fcd52b4ce8cbeeddfe548370e118 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 22 Feb 2018 18:06:37 +0100
Subject: [PATCH 2/2] fix deployRsync param in release script

---
 project/scripts/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/scripts/release b/project/scripts/release
index ed928c2953..1c4ee8ef9d 100755
--- a/project/scripts/release
+++ b/project/scripts/release
@@ -367,7 +367,7 @@ if [ $dry_run ]; then
   echodry "  rsync -rlpvz --chmod=Dg+ws,Fg+w --exclude ${release_dir}/downloads --exclude ${release_dir}/docs ${release_dir}/ ${publish_path}/"
 else
   important ssh ${release_server} "cd ${release_path}/docs/akka; git add .; git commit -m 'before publishing version $version'; true"
-  important sbt deployRsync
+  important sbt "deployRsync ${release_server}"
   important rsync -rlpvz --chmod=Dg+ws,Fg+w --exclude ${release_dir}/downloads --exclude ${release_dir}/docs ${release_dir}/ ${publish_path}/
   #important ssh ${release_server} cp -v ${release_path}/docs/akka/${version}/_static/warnOldDocs.js ${release_path}/docs/akka
   #important ssh ${release_server} ln -snvf ../../warnOldDocs.js ${release_path}/docs/akka/${version}/_static/warnOldDocs.js