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:18:51 UTC
[12/18] incubator-usergrid git commit: Merge branch 'master' into
rxportapp
Merge branch 'master' into rxportapp
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2748347a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2748347a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2748347a
Branch: refs/heads/two-dot-o-dev
Commit: 2748347a3e3e19b4db3467e429ab9e27f5742892
Parents: b58390d e1b352e
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Jul 20 16:00:55 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Jul 20 16:00:55 2015 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/tools/ExportAdmins.java | 37 ++++++++------------
.../org/apache/usergrid/tools/ImportAdmins.java | 5 +--
2 files changed, 17 insertions(+), 25 deletions(-)
----------------------------------------------------------------------