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 2016/09/16 22:34:45 UTC
[16/25] usergrid git commit: Merge branch 'master' into
usergrid-1318-queue
Merge branch 'master' into usergrid-1318-queue
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ffeadb20
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ffeadb20
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ffeadb20
Branch: refs/heads/usergrid-1318-queue
Commit: ffeadb20878d03002dd7a77fa9dacd6be614ec4b
Parents: f47a5f6 7fdba4a
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Sep 14 13:36:14 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Sep 14 13:36:14 2016 -0400
----------------------------------------------------------------------
.../usergrid/rest/exceptions/AuthErrorInfo.java | 1 +
.../shiro/filters/BasicAuthSecurityFilter.java | 22 ++-
.../management/AccountCreationProps.java | 8 +
.../cassandra/OrganizationConfigPropsImpl.java | 38 +++-
.../usergrid/services/users/UsersService.java | 15 +-
.../usergrid/tools/UniqueValueManager.java | 183 +++++++------------
6 files changed, 142 insertions(+), 125 deletions(-)
----------------------------------------------------------------------