You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/07/14 05:38:31 UTC
[25/50] usergrid git commit: Fix ports in REST tests too.
Fix ports in REST tests too.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/557ea914
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/557ea914
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/557ea914
Branch: refs/heads/master
Commit: 557ea91433dc3ffd8b78b89888fa0349226a860a
Parents: 5ddb1cd
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Jul 1 16:41:47 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Jul 1 16:41:47 2016 -0400
----------------------------------------------------------------------
.../src/test/resources/usergrid.properties | 3 ++-
.../test/resources/usergrid-custom-test.properties | 16 +++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/557ea914/stack/corepersistence/collection/src/test/resources/usergrid.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid.properties b/stack/corepersistence/collection/src/test/resources/usergrid.properties
index 8c999e2..ebc2ad4 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid.properties
@@ -20,8 +20,9 @@
# This property is required to be set and cannot be defaulted anywhere
usergrid.cluster_name=usergrid
-usergrid.cluster.hostname=localhost
+
usergrid.cluster.enabled=true
+usergrid.cluster.hostname=localhost
usergrid.cluster.region.local=us-east
usergrid.cluster.region.list=us-east
usergrid.cluster.seeds=us-east\:localhost
http://git-wip-us.apache.org/repos/asf/usergrid/blob/557ea914/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 31c6604..f20f1e5 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -56,14 +56,12 @@ usergrid.cluster_name=usergrid
usergrid.graph.shard.size=100
usergrid.graph.shard.repair.chance=1.0
-collection.akka.enabled=true
-collection.akka.hostname=localhost
-collection.akka.region=us-east
-usergrid.queue.regionList=us-east
-collection.akka.authoritative.region=us-east
-collection.akka.region.seeds=us-east\:localhost\:2551
+usergrid.cluster.enabled=true
+usergrid.cluster.hostname=localhost
+usergrid.cluster.region.local=us-east
+usergrid.cluster.region.list=us-east
+usergrid.cluster.seeds=us-east\:localhost
-collection.akka.uniquevalue.actors=300
-collection.akka.uniquevalue.cache.ttl=10
-collection.akka.uniquevalue.reservation.ttl=10
+collection.uniquevalues.actors=300
+collection.uniquevalues.authoritative.region=us-east