Merge commit 'refs/pull/537/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4bf7761b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4bf7761b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4bf7761b Branch: refs/heads/usergrid-1268-akka-211 Commit: 4bf7761bec6076a5d1acb0bce71ad0ffcf016dae Parents: 7af4f84 7ea48c2 Author: Michael Russo <[email protected]> Authored: Tue Jun 14 18:32:25 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Jun 14 18:32:25 2016 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 4 +++ .../rest/management/ManagementResource.java | 4 +-- .../shiro/filters/BasicAuthSecurityFilter.java | 19 ++++++++++-- .../management/AccountCreationProps.java | 3 +- .../usergrid/management/ManagementService.java | 6 +++- .../cassandra/AccountCreationPropsImpl.java | 17 +++++++++-- .../cassandra/ManagementServiceImpl.java | 32 ++++++++++++++++---- .../apache/usergrid/security/shiro/Realm.java | 6 ---- .../shiro/principals/AdminUserPrincipal.java | 4 +-- .../usergrid/management/OrganizationIT.java | 2 +- .../cassandra/ManagementServiceIT.java | 6 ++-- 11 files changed, 77 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
