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/03/03 21:33:53 UTC
[2/4] incubator-usergrid git commit: Merge remote-tracking branch
'gerey/USERGRID-280' into apache_usergrid/two-dot-o
Merge remote-tracking branch 'gerey/USERGRID-280' into apache_usergrid/two-dot-o
Conflicts:
stack/rest/src/test/resources/usergrid-custom-test.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/67cb7193
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/67cb7193
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/67cb7193
Branch: refs/heads/USERGRID-280
Commit: 67cb71939609d98d2788cccb5b0b33375355d24d
Parents: 83b2c23 0b5f598
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Mon Mar 2 18:25:55 2015 -0700
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Mon Mar 2 18:25:55 2015 -0700
----------------------------------------------------------------------
.../usergrid/rest/management/AdminUsersIT.java | 1342 +++++++++---------
.../rest/test/resource2point0/ClientSetup.java | 19 +-
.../rest/test/resource2point0/RestClient.java | 11 +
.../endpoints/mgmt/FeedResource.java | 48 +
.../endpoints/mgmt/PasswordResource.java | 61 +
.../endpoints/mgmt/UserResource.java | 55 +
.../endpoints/mgmt/UsersResource.java | 6 +-
.../resources/usergrid-custom-test.properties | 12 +
8 files changed, 899 insertions(+), 655 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/67cb7193/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --cc stack/rest/src/test/resources/usergrid-custom-test.properties
index 5f7f318,58cb831..886a3eb
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@@ -12,6 -12,11 +12,12 @@@
# REST module test properties
++
+ # these settings allow tests to run and consistently pass on 16GB MacBook Pro
+ # with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
+ tomcat.startup=embedded
+ tomcat.threads=200
+
cassandra.startup=external
cassandra.timeout=2000
cassandra.connections=800