summaryrefslogtreecommitdiff
path: root/databases/hbase/files/patch-hbase-env.sh
diff options
context:
space:
mode:
Diffstat (limited to 'databases/hbase/files/patch-hbase-env.sh')
-rw-r--r--databases/hbase/files/patch-hbase-env.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/hbase/files/patch-hbase-env.sh b/databases/hbase/files/patch-hbase-env.sh
index ad7406df819b..fae00d81d028 100644
--- a/databases/hbase/files/patch-hbase-env.sh
+++ b/databases/hbase/files/patch-hbase-env.sh
@@ -1,6 +1,6 @@
---- conf/hbase-env.sh.bak 2014-07-15 05:23:39.000000000 +0400
-+++ conf/hbase-env.sh 2014-07-28 23:05:05.000000000 +0400
-@@ -19,6 +19,8 @@
+--- conf/hbase-env.sh.orig 2015-11-11 22:32:08.539865000 -0700
++++ conf/hbase-env.sh 2015-11-11 22:34:34.423285000 -0700
+@@ -17,6 +17,8 @@
# * limitations under the License.
# */
@@ -9,16 +9,16 @@
# Set environment variables here.
# This script sets variables multiple times over the course of starting an hbase process,
-@@ -26,7 +28,7 @@
+@@ -24,7 +26,7 @@
# into the startup scripts (bin/hbase, etc.)
- # The java implementation to use. Java 1.6 required.
+ # The java implementation to use. Java 1.7+ required.
-# export JAVA_HOME=/usr/java/jdk1.6.0/
-+# export JAVA_HOME=/usr/java/jdk1.6.0/ --> Defined in hbase-env-dist.sh
++# export JAVA_HOME=/usr/java/jdk1.6.0/ --> Defined in hbase-env-dist.sh
# Extra Java CLASSPATH elements. Optional.
# export HBASE_CLASSPATH=
-@@ -121,7 +123,7 @@
+@@ -125,7 +127,7 @@
# export HBASE_SLAVE_SLEEP=0.1
# Tell HBase whether it should manage it's own instance of Zookeeper or not.