Merge branch 'stack' of
https://git-wip-us.apache.org/repos/asf/incubator-ranger into stack
Conflicts:
agents-audit/src/main/java/org/apache/ranger/audit/dao/AuthzAuditEventDao.java
agents-audit/src/main/java/org/apache/ranger/audit/dao/RangerHdfsAuditEventDao.java
agents-audit/src/main/java/org/apache/ranger/audit/dao/RangerHiveAuditEventDao.java
plugin-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/6ac2708b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6ac2708b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6ac2708b
Branch: refs/heads/stack
Commit: 6ac2708b51602ea32bf1f35fe4221494743059ee
Parents: 2b00241 66b1f95
Author: Madhan Neethiraj <[email protected]>
Authored: Wed Jan 7 11:31:16 2015 -0800
Committer: Madhan Neethiraj <[email protected]>
Committed: Wed Jan 7 11:31:16 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
