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 2014/03/10 22:23:14 UTC
[45/50] [abbrv] git commit: Merge branch 'master' of
github.com:usergrid/usergrid
Merge branch 'master' of github.com:usergrid/usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4fe9b9f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4fe9b9f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4fe9b9f7
Branch: refs/pull/70/merge
Commit: 4fe9b9f7160511e06b5b510fad0ee44a0e604b24
Parents: 6b1c076 ab9fdf2
Author: Shawn Feldman <sh...@gmail.com>
Authored: Mon Mar 10 15:01:56 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Mon Mar 10 15:01:56 2014 -0600
----------------------------------------------------------------------
.gitignore | 9 +-
.../org/apache/usergrid/persistence/Query.java | 5 +-
.../usergrid/persistence/entities/Export.java | 158 +++++
stack/pom.xml | 3 +
.../rest/management/ManagementResource.java | 15 +-
.../applications/ApplicationResource.java | 181 ++++-
.../rest/management/ManagementResourceIT.java | 497 ++++++++++++-
.../usergrid/management/export/ExportJob.java | 81 +++
.../management/export/ExportService.java | 48 ++
.../management/export/ExportServiceImpl.java | 608 ++++++++++++++++
.../usergrid/management/export/S3Export.java | 35 +
.../management/export/S3ExportImpl.java | 109 +++
.../services/AbstractCollectionService.java | 3 +
.../resources/usergrid-services-context.xml | 10 +
.../org/apache/usergrid/ServiceITSetup.java | 3 +
.../org/apache/usergrid/ServiceITSetupImpl.java | 6 +
.../cassandra/ManagementServiceIT.java | 707 ++++++++++++++++++-
.../management/cassandra/MockS3ExportImpl.java | 72 ++
.../RepairingMismatchedApplicationMetadata.java | 73 ++
19 files changed, 2602 insertions(+), 21 deletions(-)
----------------------------------------------------------------------