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/05/27 21:34:52 UTC

[03/50] [abbrv] incubator-usergrid git commit: Merge branch 'master' into USERGRID-567-central-sso

Merge branch 'master' into USERGRID-567-central-sso


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

Branch: refs/heads/two-dot-o
Commit: f25254709a16b8e8c0814a00b4484159a8c1f0a7
Parents: 9a8d5e0 6d962b7
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Apr 15 14:16:33 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Apr 15 14:16:33 2015 -0400

----------------------------------------------------------------------
 .../org/apache/usergrid/tools/ExportAdmins.java | 236 ++++++++++
 .../org/apache/usergrid/tools/ImportAdmins.java | 451 +++++++++++++++++++
 2 files changed, 687 insertions(+)
----------------------------------------------------------------------