You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/02/23 22:46:24 UTC
incubator-usergrid git commit: Don't run two schedulers.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-273 93b133b51 -> 2d2bdae38
Don't run two schedulers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2d2bdae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2d2bdae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2d2bdae3
Branch: refs/heads/USERGRID-273
Commit: 2d2bdae3812606ea649a4470ddd9a69863baf22d
Parents: 93b133b
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Feb 23 16:46:21 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Feb 23 16:46:21 2015 -0500
----------------------------------------------------------------------
.../rest/src/test/resources/usergrid-custom-test.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2d2bdae3/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties
index d9688c4..5f7f318 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -12,11 +12,6 @@
# REST module test properties
-# these settings allow tests to run and consistently pass on 16GB MacBook Pro
-# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
-tomcat.startup=embedded
-tomcat.threads=200
-
cassandra.startup=external
cassandra.timeout=2000
cassandra.connections=800
@@ -29,6 +24,9 @@ hystrix.threadpool.graph_async.coreSize=1200
# needed to enable refresh and properties end-points used in tests
usergrid.test=true
+# the scheduled will be started inside the remote Tomcat VM, not in Maven VM
+usergrid.scheduler.enabled=false
+
# needed for DuplicateNameIT
collection.stage.transient.timeout=5