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/02/26 00:20:54 UTC
[5/5] git commit: Merge 1a2028daa314cc3bf5f841600a6280d4d90d2484 into
9aff385f50cc3af1b60082882dcef442eeefbb6e
Merge 1a2028daa314cc3bf5f841600a6280d4d90d2484 into 9aff385f50cc3af1b60082882dcef442eeefbb6e
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f827d16b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f827d16b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f827d16b
Branch: refs/pull/60/merge
Commit: f827d16bfa7ee2381b14deffbeaa301f51908bb1
Parents: 9aff385 1a2028d
Author: GERey <gr...@apigee.com>
Authored: Tue Feb 25 14:57:05 2014 -0800
Committer: GERey <gr...@apigee.com>
Committed: Tue Feb 25 14:57:05 2014 -0800
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/Query.java | 5 +-
.../usergrid/persistence/entities/Export.java | 141 ++++++
.../rest/management/ManagementResource.java | 15 +-
.../applications/ApplicationResource.java | 81 +++-
.../rest/management/ManagementResourceIT.java | 181 +++++++-
.../apache/usergrid/management/ExportInfo.java | 73 ++++
.../usergrid/management/export/ExportJob.java | 78 ++++
.../management/export/ExportService.java | 32 ++
.../management/export/ExportServiceImpl.java | 435 ++++++++++++++++++
.../usergrid/management/export/S3Export.java | 16 +
.../management/export/S3ExportImpl.java | 83 ++++
.../resources/usergrid-services-context.xml | 8 +
.../org/apache/usergrid/ServiceITSetup.java | 3 +
.../org/apache/usergrid/ServiceITSetupImpl.java | 6 +
.../cassandra/ManagementServiceIT.java | 437 ++++++++++++++++++-
.../management/cassandra/MockS3ExportImpl.java | 47 ++
16 files changed, 1623 insertions(+), 18 deletions(-)
----------------------------------------------------------------------