You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/21 05:31:26 UTC
[8/8] git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2c6cb6f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2c6cb6f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2c6cb6f9
Branch: refs/heads/two-dot-o-push-notifications
Commit: 2c6cb6f9557b2236383fe7edf8d652c756ccaab8
Parents: 9d4b70e ac0ca5d
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Aug 20 17:16:22 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Aug 20 17:16:22 2014 -0600
----------------------------------------------------------------------
.../src/main/groovy/NodeRegistry.groovy | 17 +++++++---
.../src/main/groovy/configure_cassandra.groovy | 10 +-----
.../corepersistence/CpEntityManager.java | 7 ++--
.../corepersistence/CpEntityManagerFactory.java | 17 ++++++++++
.../resources/usergrid-custom-test.properties | 6 ++--
stack/rest/pom.xml | 2 --
.../rest/test/RefreshIndexResource.java | 6 ++--
stack/rest/src/main/webapp/WEB-INF/web.xml | 34 ++++++++++----------
.../apache/usergrid/rest/TomcatResource.java | 4 ++-
.../activities/PagingEntitiesTest.java | 2 +-
.../rest/management/ManagementResourceIT.java | 2 ++
.../rest/management/users/MUUserResourceIT.java | 24 ++++++++------
.../resources/usergrid-custom-test.properties | 12 ++++---
.../resources/usergrid-custom-test.properties | 6 ++--
stack/test-utils/pom.xml | 5 ---
15 files changed, 87 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2c6cb6f9/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2c6cb6f9/stack/services/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --cc stack/services/src/test/resources/usergrid-custom-test.properties
index 94b8adf,71c7acc..b8965ee
--- a/stack/services/src/test/resources/usergrid-custom-test.properties
+++ b/stack/services/src/test/resources/usergrid-custom-test.properties
@@@ -16,13 -16,7 +16,13 @@@
# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
cassandra.startup=embedded
elasticsearch.startup=embedded
- cassandra.timeout=5000
+ cassandra.timeout=2000
cassandra.connections=1000
- hystrix.threadpool.graph_user.coreSize=100
- hystrix.threadpool.graph_async.coreSize=100
+
+#Poll interval to check for new jobs in millseconds. 10 milliseconds for testing
+usergrid.scheduler.job.interval=100
+
+# number of delivery queue processes expected
+notification.concurrent.batches=2
+ hystrix.threadpool.graph_user.coreSize=200
+ hystrix.threadpool.graph_async.coreSize=200