Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Add unique value index update option to UniqueValueManager tool. Add support for application and organization client credentials to be passed in Authorization header. Fix NPE when user doesn't exist after lookup from the unique value index. Use URLs (like admin reset password URL) from properties if they are provided. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7fdba4a2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7fdba4a2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7fdba4a2 Branch: refs/heads/usergrid-1318-queue Commit: 7fdba4a2cfa6d18047b5b893382806a342a78eff Parents: 9016fd2 d915f55 Author: Dave Johnson <snoopd...@apache.org> Authored: Wed Sep 14 13:25:21 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Wed Sep 14 13:25:21 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(-) ----------------------------------------------------------------------
