You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/29 21:14:44 UTC
[2/2] incubator-usergrid git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a0546ce8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a0546ce8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a0546ce8
Branch: refs/heads/two-dot-o-dev
Commit: a0546ce88e1908d17452e63d5aa8d5f900d05f13
Parents: ebd7ac6 8195cb0
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jun 29 13:14:38 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jun 29 13:14:38 2015 -0600
----------------------------------------------------------------------
.usergridversion | 1 +
LICENSE | 41 +--
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 -
.../org/apache/usergrid/tools/ExportAdmins.java | 268 ++++++++++---------
.../org/apache/usergrid/tools/ImportAdmins.java | 252 ++++++++---------
stack/tools/src/main/resources/log4j.properties | 5 +-
12 files changed, 293 insertions(+), 304 deletions(-)
----------------------------------------------------------------------