usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [20/20] incubator-usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-752
Date Wed, 08 Jul 2015 17:37:41 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-752


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

Branch: refs/heads/USERGRID-752
Commit: 9a92fcc83963e40ff14c1670d881b0790d9cf643
Parents: b2e1fe6 648b599
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Jul 8 11:37:13 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Jul 8 11:37:13 2015 -0600

----------------------------------------------------------------------
 CHANGELOG                                       |   6 +
 LICENSE                                         |  49 ++-
 NOTICE                                          |   3 +-
 .../css/arsmarquette/ARSMaquettePro-Light.otf   | Bin 184600 -> 0 bytes
 .../css/arsmarquette/ARSMaquettePro-Medium.otf  | Bin 188020 -> 0 bytes
 .../css/arsmarquette/ARSMaquettePro-Regular.otf | Bin 188096 -> 0 bytes
 portal/css/main.css                             |  15 -
 portal/css/main.min.css                         |   2 +-
 release/release-candidate.sh                    |  10 -
 stack/LICENSE-2.0.txt                           | 202 ------------
 stack/rest/pom.xml                              |  11 +-
 .../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/ExportAdmins.java | 328 ++++++++++---------
 .../org/apache/usergrid/tools/ImportAdmins.java | 297 ++++++++---------
 .../org/apache/usergrid/tools/UserManager.java  |  22 ++
 stack/tools/src/main/resources/log4j.properties |   6 +-
 18 files changed, 401 insertions(+), 552 deletions(-)
----------------------------------------------------------------------



Mime
View raw message