Fix rebase error.

apache · Aug 21, 2018 · 3e2c891 · 3e2c891
1 parent 879ba51
commit 3e2c891
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/core/invoker/src/main/resources/application.conf b/core/invoker/src/main/resources/application.conf
@@ -37,6 +37,7 @@ whisk {
  }
 
  container-pool {
+ user-memory: 1024 m
  akka-client: false # if true, use PoolingContainerClient for HTTP from invoker to action container (otherwise use ApacheBlockingContainerClient)
  }