raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #24606 from akka/wip-deprecated-blocking-io-dispatcher-patriknw

Browse source 
fix blocking-io-dispatcher setting, #24357
This commit is contained in:
Patrik Nordwall 2018-02-22 19:11:00 +01:00 • committed by GitHub
commit 488c22561f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-stream/src/main/resources/reference.conf
View file

@ -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"

2
project/scripts/release
View file

@ -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