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/f7ec8219 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/f7ec8219 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/f7ec8219 Branch: refs/heads/tag-policy Commit: f7ec8219d2c8ff18f9806034b302720f7c62d1af Parents: 0c6d878 9d15be5 Author: Madhan Neethiraj <[email protected]> Authored: Fri Jun 5 18:59:34 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Fri Jun 5 18:59:34 2015 -0700 ---------------------------------------------------------------------- .../audit/destination/HDFSAuditDestination.java | 6 +- .../audit/provider/AuditProviderFactory.java | 3 +- .../apache/ranger/audit/provider/MiscUtil.java | 132 +++++++++++++++++-- .../ranger/audit/queue/AuditAsyncQueue.java | 27 +++- .../ranger/audit/queue/AuditBatchQueue.java | 26 +++- .../ranger/audit/queue/AuditFileSpool.java | 25 +++- .../apache/ranger/audit/queue/AuditQueue.java | 8 ++ .../ranger/audit/queue/AuditSummaryQueue.java | 28 +++- .../plugin/audit/RangerDefaultAuditHandler.java | 3 +- .../service-defs/ranger-servicedef-kafka.json | 29 +++- .../service-defs/ranger-servicedef-solr.json | 8 +- .../scripts/ranger-admin-services.sh | 4 +- .../hadoop/RangerHdfsAuthorizer.java | 3 +- kms/scripts/ranger-kms | 2 +- plugin-kafka/conf/kafka-ranger-env.sh | 2 +- .../kafka/authorizer/RangerKafkaAuthorizer.java | 86 ++++++++---- plugin-solr/pom.xml | 6 +- pom.xml | 32 ++++- .../org/apache/ranger/biz/ServiceDBStore.java | 7 + .../java/org/apache/ranger/rest/AssetREST.java | 19 ++- .../org/apache/ranger/rest/ServiceREST.java | 3 + .../service/filter/RangerRESTAPIFilter.java | 9 -- src/main/assembly/storm-agent.xml | 4 +- 23 files changed, 385 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f7ec8219/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f7ec8219/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java ----------------------------------------------------------------------
