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/02 23:21:40 UTC
[39/39] git commit: Merge cb76cca98c60e32e555e6e180ec3d17fb26d1b28
into 1b4038a5d26a863dece8e21d3e63745686cfe2c5
Merge cb76cca98c60e32e555e6e180ec3d17fb26d1b28 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/eeb45cac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/eeb45cac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/eeb45cac
Branch: refs/pull/92/merge
Commit: eeb45cac9fe4dafe51c6cd290e1a8261c197deb6
Parents: 1b4038a cb76cca
Author: GERey <gr...@apigee.com>
Authored: Wed Apr 2 20:45:27 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Wed Apr 2 20:45:27 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 +++----------
.../management/export/ExportService.java | 5 +-
.../management/export/ExportServiceImpl.java | 359 ++++---
.../usergrid/management/export/S3Export.java | 2 -
.../management/export/S3ExportImpl.java | 2 -
.../usergrid/ConcurrentServiceITSuite.java | 3 +-
.../management/cassandra/ExportServiceIT.java | 1004 ++++++++++++++++++
.../cassandra/ManagementServiceIT.java | 946 +----------------
.../management/cassandra/MockS3ExportImpl.java | 13 +-
.../security/tokens/TokenServiceIT.java | 3 +-
14 files changed, 2155 insertions(+), 1772 deletions(-)
----------------------------------------------------------------------