You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/12/17 23:14:26 UTC
[7/7] usergrid git commit: Merge commit 'refs/pull/448/head' of
github.com:apache/usergrid into 1.x
Merge commit 'refs/pull/448/head' of github.com:apache/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/69eeb918
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/69eeb918
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/69eeb918
Branch: refs/heads/1.x
Commit: 69eeb9187f46f2d314b746f6ee6c30669650539b
Parents: ccf4e42 3ab0c4f
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Dec 17 14:14:09 2015 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Dec 17 14:14:09 2015 -0800
----------------------------------------------------------------------
.../usergrid/management/ManagementService.java | 4 +-
.../cassandra/ManagementServiceImpl.java | 28 +-
.../org/apache/usergrid/tools/DupOrgRepair.java | 267 --------
.../usergrid/tools/DuplicateOrgInterface.java | 112 ++++
.../usergrid/tools/DuplicateOrgRepair.java | 660 +++++++++++++++++++
.../usergrid/tools/DuplicateOrgRepairTest.java | 472 +++++++++++++
.../test/resources/usergrid-test-context.xml | 52 ++
7 files changed, 1324 insertions(+), 271 deletions(-)
----------------------------------------------------------------------