You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dr...@apache.org on 2017/08/25 12:25:57 UTC

[incubator-openwhisk-devtools] branch master updated: [docker-compose] updated DEFAULTLIMITS to LIMITS in env (#48)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 12fe467  [docker-compose] updated DEFAULTLIMITS to LIMITS in env (#48)
12fe467 is described below

commit 12fe467b6fff41d2ba82f3cd807eca553bbb3002
Author: ddragosd <dd...@gmail.com>
AuthorDate: Fri Aug 25 05:25:54 2017 -0700

    [docker-compose] updated DEFAULTLIMITS to LIMITS in env (#48)
    
    * updated DEFAULTLIMITS to LIMITS in env
    * removed restart-controller target from quick-start
---
 docker-compose/Makefile                    |  2 +-
 docker-compose/docker-whisk-controller.env | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index ce754c2..25263ab 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -50,7 +50,7 @@ build-cli:
 		./gradlew :tools:cli:distDocker
 
 .PHONY: run
-run: check-required-ports setup start-docker-compose init-couchdb restart-controller init-whisk-cli
+run: check-required-ports setup start-docker-compose init-couchdb init-whisk-cli
 
 .PHONY: check-required-ports
 check-required-ports:
diff --git a/docker-compose/docker-whisk-controller.env b/docker-compose/docker-whisk-controller.env
index 479de25..6207f9c 100644
--- a/docker-compose/docker-whisk-controller.env
+++ b/docker-compose/docker-whisk-controller.env
@@ -16,11 +16,11 @@ DB_WHISK_ACTIVATIONS=local_activations
 
 KAFKA_NUMPARTITIONS=1
 
-DEFAULTLIMITS_ACTIONS_INVOKES_PERMINUTE=60000
-DEFAULTLIMITS_ACTIONS_INVOKES_CONCURRENT=5000
-DEFAULTLIMITS_TRIGGERS_FIRES_PERMINUTE=60000
-DEFAULTLIMITS_ACTIONS_INVOKES_CONCURRENTINSYSTEM=5000
-DEFAULTLIMITS_ACTIONS_SEQUENCE_MAXLENGTH=20
+LIMITS_ACTIONS_INVOKES_PERMINUTE=60000
+LIMITS_ACTIONS_INVOKES_CONCURRENT=5000
+LIMITS_TRIGGERS_FIRES_PERMINUTE=60000
+LIMITS_ACTIONS_INVOKES_CONCURRENTINSYSTEM=5000
+LIMITS_ACTIONS_SEQUENCE_MAXLENGTH=20
 LIMITS_ACTIONS_INVOKES_PERHOUR=3600000
 LIMITS_ACTIONS_INVOKES_PERMINUTE=60000
 LIMITS_ACTIONS_INVOKES_CONCURRENT=5000

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].