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/06/29 19:40:46 UTC
[34/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
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/c019ae9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c019ae9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c019ae9e
Branch: refs/heads/USERGRID-703
Commit: c019ae9e1c7cd0ae45b32e493612358b4823e86e
Parents: 4a27f3f 69aecff
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jun 22 15:17:56 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jun 22 15:17:56 2015 -0600
----------------------------------------------------------------------
.../main/resources/usergrid-core-context.xml | 2 +-
.../org/apache/usergrid/rest/IndexResource.java | 39 +-
.../apache/usergrid/rest/IndexResourceIT.java | 14 +-
.../applications/ApplicationResourceIT.java | 126 +++-
.../rest/test/resource2point0/ClientSetup.java | 32 +-
.../rest/test/resource2point0/RestClient.java | 8 +-
.../endpoints/NamedResource.java | 29 +-
.../endpoints/SystemResource.java | 21 +
.../endpoints/mgmt/ApplicationResource.java | 2 +-
stack/rest/src/test/resources/log4j.properties | 30 +-
.../cassandra/ManagementServiceImpl.java | 3 +-
.../apache/usergrid/security/shiro/Realm.java | 2 +-
.../security/shiro/utils/SubjectUtils.java | 4 +-
.../apache/usergrid/management/EmailFlowIT.java | 6 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 469 +++++++++++----
.../org/apache/usergrid/tools/ImportAdmins.java | 598 ++++++++++++++-----
16 files changed, 999 insertions(+), 386 deletions(-)
----------------------------------------------------------------------