usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [6/8] git commit: Merge 9aeb66b0540e38e78a8db966bf3e8df9fe602f78 into 778511b710df15b53a21db98b6a0f6aa0b393883
Date Mon, 07 Apr 2014 18:21:31 GMT
Merge 9aeb66b0540e38e78a8db966bf3e8df9fe602f78 into 778511b710df15b53a21db98b6a0f6aa0b393883


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/90e60ecb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/90e60ecb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/90e60ecb

Branch: refs/pull/92/merge
Commit: 90e60ecb20d327a2fd42b7522e3243646da0ab40
Parents: 778511b 9aeb66b
Author: GERey <greyes@apigee.com>
Authored: Mon Apr 7 17:56:37 2014 +0000
Committer: GERey <greyes@apigee.com>
Committed: Mon Apr 7 17:56:37 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    |  347 +++---
 .../usergrid/management/export/S3Export.java    |    6 +-
 .../management/export/S3ExportImpl.java         |    9 +-
 .../resources/usergrid-services-context.xml     |    2 -
 .../usergrid/ConcurrentServiceITSuite.java      |    3 +-
 .../management/cassandra/ExportServiceIT.java   | 1004 ++++++++++++++++++
 .../cassandra/ManagementServiceIT.java          |  946 +----------------
 .../management/cassandra/MockS3ExportImpl.java  |   57 +-
 .../security/tokens/TokenServiceIT.java         |    3 +-
 16 files changed, 2165 insertions(+), 1808 deletions(-)
----------------------------------------------------------------------



Mime
View raw message