You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2015/03/26 03:45:37 UTC

tajo git commit: TAJO-1434: Fix supporting version of Hadoop.

Repository: tajo
Updated Branches:
  refs/heads/master 12f30c585 -> f9346e509


TAJO-1434: Fix supporting version of Hadoop.

Closes #443

Signed-off-by: Jinho Kim <jh...@apache.org>


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

Branch: refs/heads/master
Commit: f9346e5093fdcbaab3927d192af25dea721b7956
Parents: 12f30c5
Author: Dongjoon Hyun <do...@apache.org>
Authored: Wed Mar 25 12:51:41 2015 +0900
Committer: Jinho Kim <jh...@apache.org>
Committed: Thu Mar 26 11:43:12 2015 +0900

----------------------------------------------------------------------
 CHANGES                                       | 3 +++
 tajo-docs/src/main/sphinx/getting_started.rst | 2 +-
 tajo-project/pom.xml                          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/f9346e50/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 59ca1d5..da522a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,6 +44,9 @@ Release 0.11.0 - unreleased
 
   BUG FIXES
 
+    TAJO-1434: Fix supporting version of Hadoop. 
+    (Contributed by Dongjoon Hyun, Committed by jinho)
+
     TAJO-1449: TestSelectQuery.testExplainSelect() fails. (jihoon)
 
     TAJO-1396: Unexpected IllegalMonitorStateException can be thrown 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f9346e50/tajo-docs/src/main/sphinx/getting_started.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/getting_started.rst b/tajo-docs/src/main/sphinx/getting_started.rst
index 2e07222..eaf6973 100644
--- a/tajo-docs/src/main/sphinx/getting_started.rst
+++ b/tajo-docs/src/main/sphinx/getting_started.rst
@@ -8,7 +8,7 @@ In this section, we explain setup of a standalone Tajo instance. It will run aga
 Prerequisites
 ======================
 
- * Hadoop 2.3.0 or higher (up to 2.5.1)
+ * Hadoop 2.3.0 or higher (up to 2.6.0)
  * Java 1.6 or 1.7
  * Protocol buffer 2.5.0
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f9346e50/tajo-project/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml
index 37121e3..7ad4ae0 100644
--- a/tajo-project/pom.xml
+++ b/tajo-project/pom.xml
@@ -33,7 +33,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <hadoop.version>2.5.1</hadoop.version>
+    <hadoop.version>2.6.0</hadoop.version>
     <protobuf.version>2.5.0</protobuf.version>
     <tajo.version>0.11.0-SNAPSHOT</tajo.version>
     <hbase.version>0.98.7-hadoop2</hbase.version>