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/06 02:48:41 UTC
[2/2] 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
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0fb13ee0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0fb13ee0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0fb13ee0
Branch: refs/heads/two-dot-o-import
Commit: 0fb13ee0be102bc4094d9605c0f677d11b5c0d52
Parents: 3930e85 7d27c23
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Feb 5 18:48:35 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Feb 5 18:48:35 2015 -0700
----------------------------------------------------------------------
.../management/export/ExportServiceImpl.java | 15 +-
.../management/export/ExportServiceIT.java | 360 +++++++++----------
.../management/export/MockS3ExportImpl.java | 4 +-
.../management/importer/ImportCollectionIT.java | 279 ++++++++------
4 files changed, 353 insertions(+), 305 deletions(-)
----------------------------------------------------------------------