usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [23/33] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-push-notifications
Date Fri, 05 Sep 2014 21:11:26 GMT
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-push-notifications

# By Dave Johnson (3) and ryan bridges (2)
# Via ryan bridges
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
  setting the max heap back to 1024m
  POM updates to control test fork behavior.
  Add support for c3.2xlarge to AWS Cluster template.
  Fix  to "reindex on update" logic that allows the ServiceInvocationIT tests to pass.
  Make sure Tomcat gets the ulimit.

Conflicts:
	stack/pom.xml


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

Branch: refs/heads/two-dot-o
Commit: 8a20936275587ad861a68db78011391c30ab2735
Parents: 10c8d28 981f4af
Author: grey <greyes@apigee.com>
Authored: Mon Aug 25 16:38:11 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Mon Aug 25 16:38:11 2014 -0700

----------------------------------------------------------------------
 .../main/dist/init_instance/init_rest_server.sh |   6 +-
 stack/awscluster/ugcluster-cf.json              |  10 +-
 stack/core/pom.xml                              |  14 ++-
 .../corepersistence/CpEntityManager.java        |  63 ++---------
 .../corepersistence/CpRelationManager.java      | 108 ++++++++++++++++---
 stack/pom.xml                                   |   8 ++
 stack/rest/pom.xml                              |  11 +-
 stack/services/pom.xml                          |  28 +++--
 .../usergrid/services/ServiceInvocationIT.java  |  49 ++++-----
 .../usergrid/cassandra/CassandraMain.java       |   2 +-
 .../usergrid/cassandra/CassandraResource.java   |   4 +-
 11 files changed, 179 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a209362/stack/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a209362/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a209362/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index 600217c,0ff39ae..c212920
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -115,7 -115,11 +115,11 @@@
      <antlr.version>3.4</antlr.version>
      <tika.version>1.4</tika.version>
      <elasticsearch.version>1.2.3</elasticsearch.version>
 -
 +    <metrics.version>3.0.0</metrics.version>
+     <usergrid.it.forkCount>3</usergrid.it.forkCount>
+     <usergrid.it.reuseForks>false</usergrid.it.reuseForks>
+     <usergrid.it.parallel>suites</usergrid.it.parallel>
+ 
    </properties>
  
    <licenses>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a209362/stack/services/pom.xml
----------------------------------------------------------------------


Mime
View raw message