Merge branch 'master' into fix-non-empty-spark-conf-paraments

bzz · bzz · commit 50632f1fd261 · 2015-04-17T12:26:45.000+09:00
diff --git a/pom.xml b/pom.xml
@@ -1415,6 +1415,16 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>hadoop-2.6</id>
+      <properties>
+        <hadoop.version>2.6.0</hadoop.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <jets3t.version>0.9.3</jets3t.version>
+        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
+      </properties>
+    </profile>
+
     <profile>
       <id>mapr3</id>
       <activation>
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
@@ -156,7 +156,7 @@ public Properties getProperty() {
       }
     }
 
-    return property;
+    return p;
   }
 
   public String getProperty(String key) {

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public Properties getProperty() {`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`159`		`- return property;`
	`159`	`+ return p;`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`public String getProperty(String key) {`