Skip to content

Commit

Permalink
Move controller config to reference.conf. (#3490)
Browse files Browse the repository at this point in the history
Fixes #3482 by moving the config to reference.conf such that it can be
overridden in application.conf in test in deterministic way.
  • Loading branch information
chetanmeh authored and markusthoemmes committed Apr 3, 2018
1 parent cb60132 commit 5568bf5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 0 additions & 10 deletions core/controller/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@
include "logging"
include "akka-http-version"

whisk {
loadbalancer {
invoker-busy-threshold: 4
blackbox-fraction: 10%
}
controller {
protocol: http
}
}

# http://doc.akka.io/docs/akka-http/current/scala/http/configuration.html
# descriptions inlined below for convenience
akka.http {
Expand Down
10 changes: 10 additions & 0 deletions core/controller/src/main/resources/reference.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

whisk {
loadbalancer {
invoker-busy-threshold: 4
blackbox-fraction: 10%
}
controller {
protocol: http
}
}

0 comments on commit 5568bf5

Please sign in to comment.