usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [40/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Date Fri, 24 Jul 2015 15:22:08 GMT
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into two-dot-o-dev


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

Branch: refs/heads/USERGRID-869
Commit: ca4575d6d2b6605a838e7899eea503ea889c57b8
Parents: 11f8049 d32cee4
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Jul 22 08:37:39 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Jul 22 08:37:39 2015 -0600

----------------------------------------------------------------------
 CHANGELOG                                       |   3 -
 LICENSE                                         |  10 +
 stack/LICENSE-2.0.txt                           | 202 -------------------
 .../applications/assets/AssetResourceIT.java    |   2 +-
 .../src/test/resources/cat-larger-than-6mb.jpg  | Bin 9799257 -> 0 bytes
 .../src/test/resources/ship-larger-than-6mb.gif | Bin 0 -> 7407487 bytes
 .../org/apache/usergrid/tools/AppAudit.java     |  30 +--
 .../java/org/apache/usergrid/tools/Cli.java     |   6 +-
 .../apache/usergrid/tools/DupAdminRepair.java   |  34 +---
 .../org/apache/usergrid/tools/DupOrgRepair.java |  36 ++--
 .../apache/usergrid/tools/EntityCleanup.java    | 178 ----------------
 .../org/apache/usergrid/tools/EntityUpdate.java |  25 +--
 .../org/apache/usergrid/tools/ExportAdmins.java |  73 +++----
 .../org/apache/usergrid/tools/ImportAdmins.java |  60 ++++--
 .../org/apache/usergrid/tools/ToolBase.java     |   6 +-
 .../org/apache/usergrid/tools/UserManager.java  |  22 ++
 stack/tools/src/main/resources/log4j.properties |   1 +
 17 files changed, 152 insertions(+), 536 deletions(-)
----------------------------------------------------------------------



Mime
View raw message