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/07/22 17:17:55 UTC

[14/15] incubator-usergrid git commit: merge

merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9b9f55ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9b9f55ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9b9f55ac

Branch: refs/heads/two-dot-o
Commit: 9b9f55ac20f669451dadc7cdeeb4643ac0614ad4
Parents: a6e68a0 897fd50
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jul 21 14:09:05 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jul 21 14:09:05 2015 -0600

----------------------------------------------------------------------
 .../org/apache/usergrid/tools/ExportAdmins.java | 118 ++++++----
 .../org/apache/usergrid/tools/ImportAdmins.java | 226 ++++++++++++++-----
 .../usergrid/tools/ExportImportAdminsTest.java  |  71 ++++--
 ...adata.usergrid-management.1433331614293.json |  52 +++++
 ...users.usergrid-management.1433331614293.json |  12 +
 5 files changed, 358 insertions(+), 121 deletions(-)
----------------------------------------------------------------------