From 621891a28b8ef82201dedcdba74e74febee743e3 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Thu, 26 Mar 2015 09:07:19 -0700 Subject: [PATCH] HBASE-13339 Update default Hadoop version to 2.6.0 --- pom.xml | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d188137..9c5f840 100644 --- a/pom.xml +++ b/pom.xml @@ -1132,7 +1132,7 @@ 3.0.3 ${compileSource} - 2.5.1 + 2.6.0 3.0.0-SNAPSHOT 1.2 1.9 diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index ed00a49..1aa7471 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -219,6 +219,8 @@ Use the following legend to interpret this table: |Hadoop-2.3.x | X | NT | S | S | NT |Hadoop-2.4.x | X | NT | S | S | S |Hadoop-2.5.x | X | NT | S | S | S +|Hadoop-2.6.x | X | NT | NT | S | S +|Hadoop-2.7.x | X | NT | NT | NT | S |=== .Replace the Hadoop Bundled With HBase! -- 2.3.0