Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0e47fbf6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0e47fbf6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0e47fbf6 Branch: refs/heads/master Commit: 0e47fbf659f94ca8b0ab3d2f3a9ab639d7d7e1fd Parents: c18f8bf b5fca95 Author: Madhan Neethiraj <[email protected]> Authored: Tue Sep 8 20:29:41 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Tue Sep 8 20:29:41 2015 -0700 ---------------------------------------------------------------------- agents-common/scripts/enable-agent.sh | 4 +++ .../main/java/org/apache/util/sql/Jisql.java | 1 - .../hadoop/crypto/key/RangerKeyStore.java | 20 ++++++++++----- security-admin/scripts/install.properties | 6 ++++- security-admin/scripts/setup.sh | 8 ++++++ .../handler/RangerAuthenticationProvider.java | 18 +++++++++---- .../resources/conf.dist/ranger-admin-site.xml | 10 ++++++++ .../src/main/webapp/scripts/utils/XAUtils.js | 3 +++ src/main/assembly/storm-agent.xml | 27 ++++++++++---------- .../process/LdapUserGroupBuilder.java | 7 ++--- .../config/UserGroupSyncConfig.java | 14 ++++++++++ unixauthservice/scripts/install.properties | 2 ++ .../templates/installprop2xml.properties | 1 + .../templates/ranger-ugsync-template.xml | 4 +++ 14 files changed, 96 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0e47fbf6/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0e47fbf6/security-admin/src/main/webapp/scripts/utils/XAUtils.js ----------------------------------------------------------------------
