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/26 17:27:46 UTC
[22/50] [abbrv] incubator-usergrid git commit: Merge branch
'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-409
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
# By Dave Johnson (3) and Todd Nine (1)
# Via Todd Nine
* 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Fixes problem with arquillian configuration and plugin scope
Not needed in git.
Don't run two schedulers.
Move back to Guava 14.0.1 to enable JClouds to work properly, plus changes to Arquillian setup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07755c15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07755c15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07755c15
Branch: refs/heads/two-dot-o
Commit: 07755c15c0d525f10328384aa9f9ffe0fb8393e7
Parents: 08c1f1d b82999e
Author: grey <gr...@apigee.com>
Authored: Mon Feb 23 18:32:43 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Feb 23 18:32:43 2015 -0800
----------------------------------------------------------------------
.../batch/job/AbstractSchedulerRuntimeIT.java | 3 +-
stack/corepersistence/pom.xml | 4 +--
stack/pom.xml | 6 ++--
stack/rest/README.md | 13 +++-----
stack/rest/catalina_base/webapps/ROOT | 1 -
stack/rest/pom.xml | 35 ++++++++------------
.../usergrid/rest/JobServiceBoostrap.java | 3 +-
.../apache/usergrid/rest/AbstractRestIT.java | 18 +++++-----
.../rest/management/ImportResourceIT.java | 3 +-
.../resources/usergrid-custom-test.properties | 8 ++---
.../management/export/ExportServiceIT.java | 3 +-
.../management/importer/ImportCollectionIT.java | 3 +-
.../management/importer/ImportServiceIT.java | 3 +-
13 files changed, 43 insertions(+), 60 deletions(-)
----------------------------------------------------------------------