Merge branch 'master' into 5.3.1

mmm · mmm · commit f58f76288b4f · 2015-03-27T17:42:00.000Z
diff --git a/docker_files/hadoop-env.sh b/docker_files/hadoop-env.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+[ -d /etc/hadoop/conf ] && export HADOOP_CONF_DIR=/etc/hadoop/conf
+
diff --git a/docker_files/spark-env.sh b/docker_files/spark-env.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+[ -f /etc/spark/conf/spark-env.sh ] && . /etc/spark/conf/spark-env.sh
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#!/bin/bash
++
 +[ -d /etc/hadoop/conf ] && export HADOOP_CONF_DIR=/etc/hadoop/conf
++