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/16 20:06:24 UTC
[33/50] 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
Conflicts:
stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e2604a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e2604a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e2604a4
Branch: refs/heads/USERGRID-273
Commit: 3e2604a404593d8921a1083136f6b0fd01aad315
Parents: a754959 fa34326
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Feb 12 11:18:02 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Feb 12 11:18:02 2015 -0700
----------------------------------------------------------------------
.../organizations/OrganizationResource.java | 3 -
.../applications/ApplicationResource.java | 3 -
.../management/importer/FileImportTracker.java | 2 +-
.../management/importer/ImportServiceImpl.java | 77 ++++++++++----------
4 files changed, 38 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e2604a4/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e2604a4/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------