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/07 17:22:00 UTC
[58/61] [abbrv] git commit: Merge
63fb1ca91449dc40bbc78249cd600153449aaa26 into
d565e79879a7bd74b254ddbfa0d04ad5ec6bc043
Merge 63fb1ca91449dc40bbc78249cd600153449aaa26 into d565e79879a7bd74b254ddbfa0d04ad5ec6bc043
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/23e33713
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/23e33713
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/23e33713
Branch: refs/pull/60/merge
Commit: 23e337137281f8ea6a10fa270df2e5d162b5d52c
Parents: d565e79 63fb1ca
Author: GERey <gr...@apigee.com>
Authored: Fri Mar 7 16:12:07 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Fri Mar 7 16:12:07 2014 +0000
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/Query.java | 5 +-
.../usergrid/persistence/entities/Export.java | 158 +++++
.../rest/management/ManagementResource.java | 15 +-
.../applications/ApplicationResource.java | 181 ++++-
.../rest/management/ManagementResourceIT.java | 497 ++++++++++++-
.../usergrid/management/export/ExportJob.java | 81 +++
.../management/export/ExportService.java | 48 ++
.../management/export/ExportServiceImpl.java | 608 ++++++++++++++++
.../usergrid/management/export/S3Export.java | 35 +
.../management/export/S3ExportImpl.java | 109 +++
.../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 | 72 ++
15 files changed, 2515 insertions(+), 20 deletions(-)
----------------------------------------------------------------------