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 01:22:25 UTC
[44/44] git commit: Merge 243856367f0a62ba435891852ea63cfd189ab2e3
into 1b4038a5d26a863dece8e21d3e63745686cfe2c5
Merge 243856367f0a62ba435891852ea63cfd189ab2e3 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/7dc966d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7dc966d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7dc966d0
Branch: refs/pull/92/merge
Commit: 7dc966d01dde94b2fd0c6c52c7eaeca7943dab29
Parents: 1b4038a 2438563
Author: GERey <gr...@apigee.com>
Authored: Wed Apr 2 23:06:14 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Wed Apr 2 23:06:14 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(-)
----------------------------------------------------------------------