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/04/03 23:25:46 UTC
[7/7] git commit: Merge e3b79e867e179a27d3257089936ca7f68cc13766 into
1b4038a5d26a863dece8e21d3e63745686cfe2c5
Merge e3b79e867e179a27d3257089936ca7f68cc13766 into 1b4038a5d26a863dece8e21d3e63745686cfe2c5
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/57cb46f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/57cb46f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/57cb46f1
Branch: refs/pull/92/merge
Commit: 57cb46f117c3878023df339930bfea86ecfc84a5
Parents: 1b4038a e3b79e8
Author: GERey <gr...@apigee.com>
Authored: Thu Apr 3 20:57:58 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Thu Apr 3 20:57:58 2014 +0000
----------------------------------------------------------------------
.../usergrid/persistence/entities/Export.java | 70 --
.../organizations/OrganizationResource.java | 108 ++
.../applications/ApplicationResource.java | 27 -
.../rest/management/ExportResourceIT.java | 651 ++++++++++++
.../rest/management/ManagementResourceIT.java | 734 +++----------
.../usergrid/management/export/ExportJob.java | 1 +
.../management/export/ExportService.java | 5 +-
.../management/export/ExportServiceImpl.java | 338 +++---
.../usergrid/management/export/S3Export.java | 2 -
.../management/export/S3ExportImpl.java | 2 -
.../resources/usergrid-services-context.xml | 2 -
.../usergrid/ConcurrentServiceITSuite.java | 3 +-
.../management/cassandra/ExportServiceIT.java | 1004 ++++++++++++++++++
.../cassandra/ManagementServiceIT.java | 946 +----------------
.../management/cassandra/MockS3ExportImpl.java | 13 +-
.../security/tokens/TokenServiceIT.java | 3 +-
16 files changed, 2133 insertions(+), 1776 deletions(-)
----------------------------------------------------------------------