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 2015/09/17 23:48:26 UTC
[1/2] usergrid git commit: Fix merge errors. Doh!
Repository: usergrid
Updated Branches:
refs/heads/two-dot-o-dev 61dd5595a -> a4fa0941a
Fix merge errors. Doh!
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5acb42ba
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5acb42ba
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5acb42ba
Branch: refs/heads/two-dot-o-dev
Commit: 5acb42ba61246ba6b251c074b9a993dd7a5c2051
Parents: 65d2608
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Sep 17 17:47:45 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Sep 17 17:47:45 2015 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/tools/ExportAdmins.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5acb42ba/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
index 0bb74ab..b018cd5 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
@@ -23,9 +23,11 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
+import org.apache.usergrid.management.UserInfo;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.Results;
+import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.utils.StringUtils;
import org.codehaus.jackson.JsonGenerator;
import org.slf4j.Logger;
@@ -385,13 +387,8 @@ public class ExportAdmins extends ExportingToolBase {
task.orgNamesByUuid = managementService.getOrganizationsForAdminUser( task.adminUser.getUuid() );
-<<<<<<< HEAD
- List<Org> orgs = orgMap.get( task.adminUser.getProperty( "username" ).toString().toLowerCase() );
-
-=======
List<Org> orgs = userToOrgsMap.get( task.adminUser.getProperty( "username" ).toString().toLowerCase() );
->>>>>>> master
if ( orgs != null && task.orgNamesByUuid.size() < orgs.size() ) {
// list of orgs from getOrganizationsForAdminUser() is less than expected, use userToOrgsMap
@@ -401,16 +398,6 @@ public class ExportAdmins extends ExportingToolBase {
}
task.orgNamesByUuid = bimap;
}
-<<<<<<< HEAD
-
- if ( task.orgNamesByUuid.isEmpty() ) {
- logger.error("{}:{}:{} has no orgs", new Object[] {
- task.adminUser.getProperty("username"),
- task.adminUser.getProperty("email"),
- task.adminUser.getUuid() } );
- }
-=======
->>>>>>> master
}
}
[2/2] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Posted by sn...@apache.org.
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a4fa0941
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a4fa0941
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a4fa0941
Branch: refs/heads/two-dot-o-dev
Commit: a4fa0941aa9d2a3878a7f8d47535018af0ee6655
Parents: 5acb42b 61dd559
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Sep 17 17:48:22 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Sep 17 17:48:22 2015 -0400
----------------------------------------------------------------------
.../EsIndexMappingMigrationPlugin.java | 2 +-
.../persistence/index/usergrid-mappings.json | 5 -
.../management/AppInfoMigrationPlugin.java | 234 +++++++++----------
3 files changed, 117 insertions(+), 124 deletions(-)
----------------------------------------------------------------------