Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/5b985138 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/5b985138 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/5b985138 Branch: refs/heads/master Commit: 5b98513833465c3ded8ed8e1c5e89ec8d7a42594 Parents: ec15439 5ac45ec Author: sneethiraj <[email protected]> Authored: Sun May 17 17:01:43 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Sun May 17 17:01:43 2015 -0400 ---------------------------------------------------------------------- .../scripts/ranger_credential_helper.py | 10 +++----- .../config/UserGroupSyncConfig.java | 26 +++++++++++++++++--- unixauthservice/scripts/setup.py | 1 + .../templates/ranger-ugsync-template.xml | 4 +++ 4 files changed, 32 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
