You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/05/18 15:27:13 UTC

[1/3] incubator-ranger git commit: RANGER-488: updated pom.xml with dependent component release version

Repository: incubator-ranger
Updated Branches:
  refs/heads/tag-policy 88d2ebe29 -> fa19908a9


RANGER-488:  updated pom.xml with dependent component release version


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/a5c771bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/a5c771bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/a5c771bc

Branch: refs/heads/tag-policy
Commit: a5c771bc58340ac016c98081729b4c04caba59f7
Parents: 88d2ebe
Author: sneethiraj <sn...@apache.org>
Authored: Mon May 18 00:42:07 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Mon May 18 01:07:08 2015 -0400

----------------------------------------------------------------------
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a5c771bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbb3a08..c70a4cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,12 +126,12 @@
 		<google.guava.version>17.0</google.guava.version>
 		<gson.version>2.2.4</gson.version>
 		<guava.version>11.0.2</guava.version>
-		<hadoop-auth.version>3.0.0-SNAPSHOT</hadoop-auth.version>
-		<hadoop-common.version>3.0.0-SNAPSHOT</hadoop-common.version>
-		<hadoop-common-kms.version>2.6.0</hadoop-common-kms.version>
-		<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
+		<hadoop-auth.version>2.7.0</hadoop-auth.version>
+		<hadoop-common.version>2.7.0</hadoop-common.version>
+		<hadoop-common-kms.version>2.7.0</hadoop-common-kms.version>
+		<hadoop.version>2.7.0</hadoop.version>
 		<hamcrest.all.version>1.3</hamcrest.all.version>
-		<hbase.version>1.1.0-SNAPSHOT</hbase.version>
+		<hbase.version>1.1.0</hbase.version>
 		<hive.version>1.2.0-SNAPSHOT</hive.version>
 		<storm.version>0.9.2-incubating</storm.version>
 		<httpcomponent.httpmime.version>4.2.5</httpcomponent.httpmime.version>
@@ -149,7 +149,7 @@
 		<kafka.version>0.8.2.0</kafka.version>
 		<mockito.version>1.8.4</mockito.version>
 		<hamcrest-version>1.3</hamcrest-version>
-		<knox.gateway.version>0.5.0</knox.gateway.version>
+		<knox.gateway.version>0.6.0</knox.gateway.version>
 		<local.lib.dir>${project.basedir}/../lib/local</local.lib.dir>
 		<log4j.version>1.2.17</log4j.version>
 		<mysql-connector-java.version>5.1.31</mysql-connector-java.version>


[3/3] incubator-ranger git commit: RANGER-472 : Fix 400 error

Posted by ma...@apache.org.
RANGER-472 : Fix 400 error

Signed-off-by: sneethiraj <sn...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/fa19908a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/fa19908a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/fa19908a

Branch: refs/heads/tag-policy
Commit: fa19908a9bc6d2f80a26635d48012c87341b1f5d
Parents: c484cec
Author: Gautam Borad <gb...@gmail.com>
Authored: Mon May 18 12:00:05 2015 +0530
Committer: sneethiraj <sn...@apache.org>
Committed: Mon May 18 02:36:31 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/hadoop/crypto/key/kms/server/KMS.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa19908a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
index 9b5b5a1..5575eab 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
@@ -316,10 +316,13 @@ public class KMS {
           }
         }
     );
-
     Object json = KMSServerJSONUtils.toJSON(keyVersion);
-    kmsAudit.ok(user, KMSOp.GET_CURRENT_KEY, name, "");
-    return Response.ok().type(MediaType.APPLICATION_JSON).entity(json).build();
+    if (keyVersion != null) {
+    	kmsAudit.ok(user, KMSOp.GET_CURRENT_KEY, name, "");
+    	return Response.ok().type(MediaType.APPLICATION_JSON).entity(json).build();
+    }else{
+    	return Response.status(404).type(MediaType.APPLICATION_JSON).entity(json).build();
+    }
   }
 
   @GET


[2/3] incubator-ranger git commit: RANGER-246 : adding credential helper as part of kafka plugin deployment (Gautam Borad via Selvamohan Neethiraj)

Posted by ma...@apache.org.
RANGER-246 : adding credential helper as part of kafka plugin deployment (Gautam Borad via Selvamohan Neethiraj)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c484ceca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c484ceca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c484ceca

Branch: refs/heads/tag-policy
Commit: c484cecae0ea726ea74a8a97f9724f9076edb584
Parents: a5c771b
Author: sneethiraj <sn...@apache.org>
Authored: Mon May 18 01:57:48 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Mon May 18 02:07:57 2015 -0400

----------------------------------------------------------------------
 src/main/assembly/plugin-kafka.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c484ceca/src/main/assembly/plugin-kafka.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/plugin-kafka.xml b/src/main/assembly/plugin-kafka.xml
index b3620bc..aa66e08 100644
--- a/src/main/assembly/plugin-kafka.xml
+++ b/src/main/assembly/plugin-kafka.xml
@@ -147,6 +147,11 @@
         <fileMode>755</fileMode>
     </file>
     <file>
+        <source>security-admin/scripts/ranger_credential_helper.py</source>
+        <outputDirectory>/</outputDirectory>
+        <fileMode>755</fileMode>
+    </file>
+    <file>
         <source>plugin-kafka/scripts/install.properties</source>
         <outputDirectory>/</outputDirectory>
         <destName>install.properties</destName>