Repository: tajo Updated Branches: refs/heads/branch-0.10.1 e563db223 -> e854f830f
TAJO-1434: Fix supporting version of Hadoop. Closes #443 Signed-off-by: Jinho Kim <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e854f830 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e854f830 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e854f830 Branch: refs/heads/branch-0.10.1 Commit: e854f830f2f9ff67a23c751cbbd7afa48d6f0500 Parents: e563db2 Author: Dongjoon Hyun <[email protected]> Authored: Wed Mar 25 12:51:41 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Thu Mar 26 11:48:21 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/e854f830/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 5724300..0abdbd3 100644 --- a/CHANGES +++ b/CHANGES @@ -21,6 +21,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1434: Fix supporting version of Hadoop. + (Contributed by Dongjoon Hyun, Committed by jinho) + TAJO-1396: Unexpected IllegalMonitorStateException can be thrown in QueryInProgress. (Contributed by navis. Committed by jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/e854f830/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/e854f830/tajo-project/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml index 9f1b1ab..cec93e3 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>
