You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/09 19:30:13 UTC
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import-multicollection
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import-multicollection
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5ffa1cd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5ffa1cd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5ffa1cd7
Branch: refs/heads/two-dot-o-import-multicollection
Commit: 5ffa1cd74d93f5033a4e248af6faeb57655561ad
Parents: f977a89 18671e7
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Feb 9 09:56:47 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Feb 9 09:56:47 2015 -0700
----------------------------------------------------------------------
.../management/importer/FileImportJob.java | 2 +-
.../management/importer/ImportService.java | 2 +-
.../management/importer/ImportServiceImpl.java | 458 +++++++------------
.../usergrid/management/importer/S3Import.java | 8 +-
.../management/importer/S3ImportImpl.java | 224 ++-------
.../services/queues/ImportQueueListener.java | 2 +-
.../management/importer/ImportCollectionIT.java | 12 +-
.../management/importer/MockS3ImportImpl.java | 12 +-
8 files changed, 239 insertions(+), 481 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5ffa1cd7/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5ffa1cd7/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------