Merge remote-tracking branch 'GERey/ResetSuperUserToolFix' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e0ab8d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e0ab8d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e0ab8d3 Branch: refs/heads/master Commit: 3e0ab8d3a8425022c3d24902c010a709764aa33b Parents: 464d10a 730f1e7 Author: Rod Simpson <[email protected]> Authored: Wed Nov 12 18:03:52 2014 -0700 Committer: Rod Simpson <[email protected]> Committed: Wed Nov 12 18:03:52 2014 -0700 ---------------------------------------------------------------------- .../usergrid/management/ManagementService.java | 2 ++ .../cassandra/ManagementServiceImpl.java | 20 +++++++++++++++++++- .../apache/usergrid/tools/ResetSuperUser.java | 18 ++++++++++-------- 3 files changed, 31 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e0ab8d3/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ----------------------------------------------------------------------
