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 2014/01/30 02:20:57 UTC

[17/50] [abbrv] git commit: upping runners and fixing hardcoded ip addresses in properties file, and ignoring the jssecacerts generated while running

upping runners and fixing hardcoded ip addresses in properties file, and ignoring the jssecacerts generated while running


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/480d525a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/480d525a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/480d525a

Branch: refs/heads/USERGRID-2771-graph-edges
Commit: 480d525a4b9ee7447d932e1d8ca4d8237b770bf3
Parents: 4c29d30
Author: Alex Karasulu <ak...@gmail.com>
Authored: Wed Jan 15 23:56:02 2014 +0200
Committer: Alex Karasulu <ak...@gmail.com>
Committed: Wed Jan 15 23:56:02 2014 +0200

----------------------------------------------------------------------
 stack/.gitignore                                   |   1 +
 stack/corepersistence/collection.tgz               | Bin 0 -> 47520 bytes
 stack/corepersistence/collection/pom.xml           |   4 ++--
 .../src/test/resources/usergrid-CHOP.properties    |  16 +++++-----------
 4 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/480d525a/stack/.gitignore
----------------------------------------------------------------------
diff --git a/stack/.gitignore b/stack/.gitignore
index bc54518..d3b96af 100644
--- a/stack/.gitignore
+++ b/stack/.gitignore
@@ -1,4 +1,5 @@
 .idea
+jssecacerts
 .sonar-ide.properties
 .clover
 atlassian-ide-plugin.xml

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/480d525a/stack/corepersistence/collection.tgz
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection.tgz b/stack/corepersistence/collection.tgz
new file mode 100644
index 0000000..1f152ca
Binary files /dev/null and b/stack/corepersistence/collection.tgz differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/480d525a/stack/corepersistence/collection/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml
index bc62409..29dba1c 100644
--- a/stack/corepersistence/collection/pom.xml
+++ b/stack/corepersistence/collection/pom.xml
@@ -77,8 +77,8 @@
           <amiID>${ami.id}</amiID>
           <awsSecurityGroup>${security.group}</awsSecurityGroup>
           <runnerKeyPairName>${runner.keypair.name}</runnerKeyPairName>
-          <minimumRunners>5</minimumRunners>
-          <maximumRunners>8</maximumRunners>
+          <minimumRunners>6</minimumRunners>
+          <maximumRunners>9</maximumRunners>
           <securityGroupExceptions>
             <!--
             Add your own IP address as an exception to allow access

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/480d525a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
index e05f487..d9c72be 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
@@ -1,18 +1,12 @@
 # These are for CHOP environment settings
 
-#cassandra.connections=${cassandra.connections}
-#cassandra.port=9160
-#cassandra.version=1.2
-#cassandra.hosts=${cassandra.hosts}
-#cassandra.cluster_name=Usergrid
-#collections.keyspace=Usergrid_Collections
-#cassandra.timeout=5000
-
-
-cassandra.connections=10
+cassandra.connections=20
 cassandra.port=9160
 cassandra.version=1.2
-cassandra.hosts=54.224.205.239, 107.21.155.136, 54.205.144.212, 23.22.49.179, 23.22.49.179, 54.242.63.170
+
+# a comma delimited private IP address list to your chop cassandra cluster
+# define this in your settings.xml and have it as an always active profile
+cassandra.hosts=${chop.cassandra.hosts}
 cassandra.cluster_name=Usergrid
 collections.keyspace=Usergrid_Collections
 cassandra.timeout=5000