Merge branch 'master' into stack
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b4d1bca6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b4d1bca6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b4d1bca6 Branch: refs/heads/stack Commit: b4d1bca6c2f998085d32fea4b0f5599f95c7fca7 Parents: eb27112 ef15231 Author: Madhan Neethiraj <[email protected]> Authored: Fri Jan 16 16:09:31 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Fri Jan 16 16:09:31 2015 -0800 ---------------------------------------------------------------------- src/main/assembly/usersync.xml | 1 + ugsync/pom.xml | 5 + .../config/UserGroupSyncConfig.java | 12 ++ .../process/FileSourceUserGroupBuilder.java | 123 ++++++++++--------- .../conf.dist/unixauthservice.properties | 20 +++ 5 files changed, 102 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
