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/23 15:32:13 UTC
[57/58] [abbrv] incubator-usergrid git commit: Merge branch 'master'
into asf-site
Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/232ec9a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/232ec9a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/232ec9a9
Branch: refs/heads/asf-site
Commit: 232ec9a9167e886631298cb13e9bad60d5720480
Parents: ec2b3e4 9b9f55a
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Jul 23 09:29:50 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Jul 23 09:29:50 2015 -0400
----------------------------------------------------------------------
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/core/pom.xml | 9 +-
stack/pom.xml | 4 +-
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
stack/tools/pom.xml | 6 +
.../org/apache/usergrid/tools/ExportAdmins.java | 139 +++--
.../org/apache/usergrid/tools/ExportApp.java | 536 +++++++++++++++++++
.../usergrid/tools/ExportDataCreator.java | 244 +++++++--
.../usergrid/tools/ExportingToolBase.java | 2 +-
.../org/apache/usergrid/tools/ImportAdmins.java | 278 +++++++---
.../org/apache/usergrid/tools/ToolBase.java | 2 +-
.../org/apache/usergrid/tools/UserManager.java | 22 +
stack/tools/src/main/resources/log4j.properties | 5 +-
.../apache/usergrid/tools/ExportAppTest.java | 118 ++++
.../usergrid/tools/ExportImportAdminsTest.java | 71 ++-
...adata.usergrid-management.1433331614293.json | 52 ++
...users.usergrid-management.1433331614293.json | 12 +
29 files changed, 1338 insertions(+), 462 deletions(-)
----------------------------------------------------------------------