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 2016/01/11 22:34:46 UTC
[1/4] usergrid git commit: This closes #450
Repository: usergrid
Updated Branches:
refs/heads/1.x a121f3796 -> a5045b86b
This closes #450
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cd51fb23
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cd51fb23
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cd51fb23
Branch: refs/heads/1.x
Commit: cd51fb2337e73af6477c2c1124dc15826c8038fc
Parents: a2df8f9
Author: Dave Johnson <sn...@apache.org>
Authored: Sun Dec 20 17:33:55 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Sun Dec 20 17:33:55 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] usergrid git commit: Merge branch '1.x' of
https://git-wip-us.apache.org/repos/asf/usergrid into 1.x
Posted by sn...@apache.org.
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/f0508239
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f0508239
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f0508239
Branch: refs/heads/1.x
Commit: f05082396c669d33fcb52fefda383e7ded227e4f
Parents: cd51fb2 7a2e68f
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Jan 4 11:20:23 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Jan 4 11:20:23 2016 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/tools/DuplicateOrgRepair.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] usergrid git commit: Merge branch '1.x' of
https://git-wip-us.apache.org/repos/asf/usergrid into 1.x
Posted by sn...@apache.org.
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/ebfa31af
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ebfa31af
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ebfa31af
Branch: refs/heads/1.x
Commit: ebfa31af71d2fa75dd485ce28f32c2c77052b9b9
Parents: f050823 6e1f5ec
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Jan 7 14:03:55 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Jan 7 14:03:55 2016 -0500
----------------------------------------------------------------------
.../usergrid/tools/DuplicateOrgRepair.java | 111 +++++++++++++------
1 file changed, 78 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[4/4] usergrid git commit: Merge branch '1.x' of
https://git-wip-us.apache.org/repos/asf/usergrid into 1.x
Posted by sn...@apache.org.
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 <sn...@apache.org>
Authored: Mon Jan 11 16:34:35 2016 -0500
Committer: Dave Johnson <sn...@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(-)
----------------------------------------------------------------------