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 2015/03/30 21:58:40 UTC
[36/50] incubator-usergrid git commit: Merge branch 'USERGRID-405'
into USERGRID-448-appinfofix
Merge branch 'USERGRID-405' into USERGRID-448-appinfofix
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/e3d9cc97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e3d9cc97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e3d9cc97
Branch: refs/heads/two-dot-o-dev
Commit: e3d9cc97985b643040f73e4ec8f78b3a08b1daf0
Parents: 3b71f5e c864ab6
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Mar 20 18:10:18 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Mar 20 18:10:18 2015 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 13 +++++++------
.../java/org/apache/usergrid/persistence/GeoIT.java | 2 +-
stack/pom.xml | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e3d9cc97/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index 3834609,19573d3..96faee0
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -121,8 -121,7 +121,8 @@@
<!-- only use half the cores on the machine for testing -->
<usergrid.it.parallel>methods</usergrid.it.parallel>
<usergrid.it.reuseForks>true</usergrid.it.reuseForks>
+
- <usergrid.it.forkCount>4</usergrid.it.forkCount>
+ <usergrid.it.forkCount>1</usergrid.it.forkCount>
<usergrid.it.threads>8</usergrid.it.threads>
<metrics.version>3.0.0</metrics.version>