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/02/18 20:29:21 UTC
[1/2] incubator-usergrid git commit: Fix forkCount parameter and
failing test in ImportCollectionsIT.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-273 399d60e77 -> 072fab4c8
Fix forkCount parameter and failing test in ImportCollectionsIT.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/627d0ca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/627d0ca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/627d0ca8
Branch: refs/heads/USERGRID-273
Commit: 627d0ca89da607e15dfa0c760467345766a29478
Parents: d87577e
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Feb 18 14:28:54 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Feb 18 14:28:54 2015 -0500
----------------------------------------------------------------------
stack/pom.xml | 14 ++++++--------
.../management/importer/ImportCollectionIT.java | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/627d0ca8/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 94fdaf6..12fac3f 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -117,19 +117,17 @@
<mockito.version>1.10.8</mockito.version>
<!-- 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>.5C</usergrid.it.forkCount>
+ <usergrid.it.parallel>methods</usergrid.it.parallel>
+ <usergrid.it.reuseForks>true</usergrid.it.reuseForks>
+ <usergrid.it.forkCount>1</usergrid.it.forkCount>
<usergrid.it.threads>2</usergrid.it.threads>
-
<metrics.version>3.0.0</metrics.version>
<rx.version>0.19.6</rx.version>
- <surefire.plugin.version>2.18.1</surefire.plugin.version>
- <powermock.version>1.6.1</powermock.version>
-
+ <surefire.plugin.version>2.18.1</surefire.plugin.version>
+ <powermock.version>1.6.1</powermock.version>
- <maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
+ <maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/627d0ca8/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
index 4994eec..acd3077 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
@@ -279,7 +279,7 @@ public class ImportCollectionIT {
// create new second application and import those things from S3
final UUID appId2 = setup.getMgmtSvc().createApplication(
- organization.getUuid(), "second").getId();
+ organization.getUuid(), "second" + RandomStringUtils.randomAlphanumeric(10)).getId();
final EntityManager emApp2 = setup.getEmf().getEntityManager(appId2);
importCollections(emApp2);
[2/2] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273
Posted by sn...@apache.org.
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/072fab4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/072fab4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/072fab4c
Branch: refs/heads/USERGRID-273
Commit: 072fab4c8cc13ffa522950a3141c805bdabc735b
Parents: 627d0ca 399d60e
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Feb 18 14:29:03 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Feb 18 14:29:03 2015 -0500
----------------------------------------------------------------------
stack/rest/README.md | 11 ++++++++++
stack/rest/pom.xml | 17 ++++++++++-----
.../apache/usergrid/rest/AbstractRestIT.java | 9 ++++----
.../test/resource2point0/AbstractRestIT.java | 22 +++++++++++++++++++
stack/rest/src/test/resources/arquillian.xml | 23 +++++++++++++++-----
5 files changed, 68 insertions(+), 14 deletions(-)
----------------------------------------------------------------------