Merge branch '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid into 1.x
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a5045b86 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a5045b86 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a5045b86 Branch: refs/heads/1.x Commit: a5045b86b9bad7f7c8adfb837b48c14784609dd9 Parents: ebfa31a a121f37 Author: Dave Johnson <snoopd...@apache.org> Authored: Mon Jan 11 16:34:35 2016 -0500 Committer: Dave Johnson <snoopd...@apache.org> Committed: Mon Jan 11 16:34:35 2016 -0500 ---------------------------------------------------------------------- .../usergrid/tools/DuplicateOrgRepair.java | 13 ++-- .../org/apache/usergrid/tools/ExportAdmins.java | 82 ++++++++++---------- .../org/apache/usergrid/tools/ImportAdmins.java | 10 ++- .../org/apache/usergrid/tools/ToolBase.java | 2 +- 4 files changed, 58 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
