You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/16 00:31:16 UTC
[7/7] usergrid git commit: Merge branch 'hotfix-20160819'
Merge branch 'hotfix-20160819'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9947d488
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9947d488
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9947d488
Branch: refs/heads/master
Commit: 9947d488d9c46980c7aea568d12f3698c1042d5d
Parents: d915f55 fdb7c27
Author: Michael Russo <mr...@apigee.com>
Authored: Thu Sep 15 17:30:59 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Thu Sep 15 17:30:59 2016 -0700
----------------------------------------------------------------------
.../actorsystem/ActorSystemManagerImpl.java | 15 ++-
.../actorsystem/ClusterListener.java | 107 +++++++++++++++++++
.../organizations/OrganizationsResource.java | 48 +++++++--
.../security/SecuredResourceFilterFactory.java | 35 +++---
.../shiro/filters/BasicAuthSecurityFilter.java | 54 ++++++++--
.../rest/applications/ApplicationDeleteIT.java | 1 -
.../usergrid/rest/applications/SecurityIT.java | 31 ++++++
.../activities/ActivityResourceIT.java | 5 -
.../test/resource/endpoints/NamedResource.java | 9 ++
.../cassandra/ManagementServiceImpl.java | 5 +-
.../AbstractPasswordCredentials.java | 3 +-
.../shiro/credentials/AdminUserPassword.java | 2 +
.../shiro/principals/AdminUserPrincipal.java | 25 +----
.../usergrid/services/AbstractService.java | 8 ++
14 files changed, 284 insertions(+), 64 deletions(-)
----------------------------------------------------------------------