You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/21 14:40:22 UTC
[07/18] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
apache_usergrid/USERGRID-273
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into apache_usergrid/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/d87577ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d87577ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d87577ee
Branch: refs/heads/USERGRID-273-indexbuffer
Commit: d87577ee6a0652f4bea286562085df40c82bfc71
Parents: d2a02dc 518b679
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Feb 18 10:40:52 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Feb 18 10:40:52 2015 -0700
----------------------------------------------------------------------
.../src/main/groovy/configure_usergrid.groovy | 2 +-
.../main/resources/usergrid-default.properties | 13 +-
.../usergrid/corepersistence/CpSetup.java | 3 +
.../entities/FailedImportEntity.java | 11 +-
stack/mongo-emulator/pom.xml | 15 +-
stack/pom.xml | 47 ++----
.../usergrid/rest/filters/MeteringFilter.java | 2 +
.../security/SecuredResourceFilterFactory.java | 2 +
.../security/shiro/filters/SecurityFilter.java | 3 +
.../usergrid/rest/DatabaseInitializer.java | 146 -------------------
.../rest/management/OrganizationsIT.java | 2 +-
.../management/importer/ImportServiceImpl.java | 5 +-
.../usergrid/management/OrganizationIT.java | 30 ++--
.../importer/FileImportTrackerTest.java | 55 +++----
.../management/importer/ImportCollectionIT.java | 49 ++++---
.../services/ApplicationsServiceIT.java | 8 +-
.../usergrid/services/ServiceInvocationIT.java | 7 +
.../usergrid/cassandra/ClearShiroSubject.java | 18 +++
18 files changed, 127 insertions(+), 291 deletions(-)
----------------------------------------------------------------------