[incubator-openwhisk] branch master updated: Move controller config to reference.conf. (#3490)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 5568bf5  Move controller config to reference.conf. (#3490)
5568bf5 is described below

commit 5568bf59f2936e4b64256048bd1c89f4d22119a7
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Tue Apr 3 14:14:59 2018 +0530

    Move controller config to reference.conf. (#3490)
    
    Fixes #3482 by moving the config to reference.conf such that it can be
    overridden in application.conf in test in deterministic way.
---
 core/controller/src/main/resources/application.conf | 10 ----------
 core/controller/src/main/resources/reference.conf   | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/controller/src/main/resources/application.conf b/core/controller/src/main/resources/application.conf
index bbc298b..446d5fe 100644
--- a/core/controller/src/main/resources/application.conf
+++ b/core/controller/src/main/resources/application.conf
@@ -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 {
diff --git a/core/controller/src/main/resources/reference.conf b/core/controller/src/main/resources/reference.conf
new file mode 100644
index 0000000..ce13c1e
--- /dev/null
+++ b/core/controller/src/main/resources/reference.conf
@@ -0,0 +1,10 @@
+
+whisk {
+  loadbalancer {
+    invoker-busy-threshold: 4
+    blackbox-fraction: 10%
+  }
+  controller {
+    protocol: http
+  }
+}

-- 
To stop receiving notification emails like this one, please contact
markusthoemmes@apache.org.