You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/06/10 22:49:46 UTC
incubator-usergrid git commit: Moving it to the default elastic
search name.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 0b9cedfe1 -> 81fd37566
Moving it to the default elastic search name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/81fd3756
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/81fd3756
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/81fd3756
Branch: refs/heads/two-dot-o-dev
Commit: 81fd375661aa8e36292bd9827675dce0f4a5176c
Parents: 0b9cedf
Author: GERey <gr...@apigee.com>
Authored: Wed Jun 10 13:49:44 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Jun 10 13:49:44 2015 -0700
----------------------------------------------------------------------
stack/config/src/test/resources/usergrid-test.properties | 4 ++--
.../queryindex/src/test/resources/usergrid-UNIT.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/81fd3756/stack/config/src/test/resources/usergrid-test.properties
----------------------------------------------------------------------
diff --git a/stack/config/src/test/resources/usergrid-test.properties b/stack/config/src/test/resources/usergrid-test.properties
index 3f680f4..c5e26cb 100644
--- a/stack/config/src/test/resources/usergrid-test.properties
+++ b/stack/config/src/test/resources/usergrid-test.properties
@@ -59,7 +59,7 @@ cassandra.writecl=QUORUM
cassandra.lock.keyspace=Locks
elasticsearch.startup=external
-elasticsearch.cluster_name=usergrid
+elasticsearch.cluster_name=elasticsearch
#Not a good number for real systems. Write shards should be 2x cluster size from our tests
#This is just way more efficient for a single node and the number of shards we're creating
@@ -254,7 +254,7 @@ usergrid.management.email.admin-password-reset=\
# User approval flow
#
-# email to admin to approve and activate new app user
+# email to admin to approve and activate new app user
usergrid.management.email.admin-user-activation=\
<p>To activate the user account for ${user_email}, click here:</p>\n\
<p><a href="${activation_url}">${activation_url}</a></p>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/81fd3756/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
index cb05a48..ba163fa 100644
--- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
@@ -14,7 +14,7 @@ collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy
collection.stage.transient.timeout=6
elasticsearch.startup=external
-elasticsearch.cluster_name=usergrid
+elasticsearch.cluster_name=elasticsearch
elasticsearch.index_prefix=usergrid
elasticsearch.hosts=127.0.0.1
elasticsearch.port=9300