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/06 20:22:05 UTC
[50/50] [abbrv] git commit: Merge
a8824941262dc05bad2b93fe593b90ad0d021415 into
631f02d5a691823a0bc8b806f3be44a5f9a59fbc
Merge a8824941262dc05bad2b93fe593b90ad0d021415 into 631f02d5a691823a0bc8b806f3be44a5f9a59fbc
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bb64d93d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bb64d93d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bb64d93d
Branch: refs/pull/60/merge
Commit: bb64d93dd12515edbf7e6732d88c18513503ba0c
Parents: 631f02d a882494
Author: GERey <gr...@apigee.com>
Authored: Thu Mar 6 19:05:02 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Thu Mar 6 19:05:02 2014 +0000
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/Query.java | 5 +-
.../usergrid/persistence/entities/Export.java | 141 ++++
.../rest/management/ManagementResource.java | 15 +-
.../applications/ApplicationResource.java | 181 ++++-
.../rest/management/ManagementResourceIT.java | 497 ++++++++++++-
.../usergrid/management/export/ExportJob.java | 65 ++
.../management/export/ExportService.java | 32 +
.../management/export/ExportServiceImpl.java | 592 ++++++++++++++++
.../usergrid/management/export/S3Export.java | 19 +
.../management/export/S3ExportImpl.java | 93 +++
.../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 | 56 ++
15 files changed, 2402 insertions(+), 20 deletions(-)
----------------------------------------------------------------------