Updated Branches: refs/heads/branch-0.8 fdbe170d6 -> c1e9c1096
WHIRR-709. Bump Hadoop to latest available version at osuosl. Project: http://git-wip-us.apache.org/repos/asf/whirr/repo Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/c1e9c109 Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/c1e9c109 Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/c1e9c109 Branch: refs/heads/branch-0.8 Commit: c1e9c1096a9173d4873ae5b33b16e2c1d881bf6b Parents: fdbe170 Author: Andrew Bayer <andrew.ba...@gmail.com> Authored: Wed Mar 27 15:11:04 2013 -0700 Committer: Andrew Bayer <andrew.ba...@gmail.com> Committed: Wed Mar 27 15:15:00 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ pom.xml | 2 +- recipes/hadoop.properties | 2 +- recipes/hbase-0.90.properties | 2 +- .../main/resources/whirr-hadoop-default.properties | 2 +- services/hama/pom.xml | 2 +- .../whirr-hbase-singlenode-test.properties | 2 +- .../src/test/resources/whirr-hbase-test.properties | 2 +- services/yarn/pom.xml | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index be58f0a..9adbdfc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,9 @@ Release 0.8.2 (unreleased changes) IMPROVEMENTS + WHIRR-709. Bump Hadoop to latest available version (1.0.4) at + osuosl. (abayer) + WHIRR-546. Add destroy instructions to stdout for all create actions. (abayer) http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 498af2d..cb02547 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ <common-ssl.version>0.3.11</common-ssl.version> <dnsjava.version>2.1.1</dnsjava.version> <guava.version>13.0</guava.version> - <hadoop.version>1.0.3</hadoop.version> + <hadoop.version>1.0.4</hadoop.version> <hamcrest.version>1.1</hamcrest.version> <hama.version>0.4.0-incubating</hama.version> <hbase.version>0.94.1</hbase.version> http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/recipes/hadoop.properties ---------------------------------------------------------------------- diff --git a/recipes/hadoop.properties b/recipes/hadoop.properties index 9a60222..53a0031 100644 --- a/recipes/hadoop.properties +++ b/recipes/hadoop.properties @@ -93,5 +93,5 @@ whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,5 hadoop-datanode+h # Expert: specify the version of Hadoop to install. # -#whirr.hadoop.version=1.0.3 +#whirr.hadoop.version=1.0.4 #whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/recipes/hbase-0.90.properties ---------------------------------------------------------------------- diff --git a/recipes/hbase-0.90.properties b/recipes/hbase-0.90.properties index bdd7300..67aa4a0 100644 --- a/recipes/hbase-0.90.properties +++ b/recipes/hbase-0.90.properties @@ -70,7 +70,7 @@ whirr.hbase.tarball.url=http://apache.cu.be/hbase/hbase-0.90.3/hbase-0.90.3.tar. # The Hadoop version to use. See http://hbase.apache.org/book/hadoop.html -#whirr.hadoop.version=1.0.3 +#whirr.hadoop.version=1.0.4 #whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/services/hadoop/src/main/resources/whirr-hadoop-default.properties ---------------------------------------------------------------------- diff --git a/services/hadoop/src/main/resources/whirr-hadoop-default.properties b/services/hadoop/src/main/resources/whirr-hadoop-default.properties index 446251e..e8bb7dd 100644 --- a/services/hadoop/src/main/resources/whirr-hadoop-default.properties +++ b/services/hadoop/src/main/resources/whirr-hadoop-default.properties @@ -16,7 +16,7 @@ # limitations under the License. # -whirr.hadoop.version=1.0.3 +whirr.hadoop.version=1.0.4 whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz # Hadoop defaults. The first part of the key is removed by whirr. http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/services/hama/pom.xml ---------------------------------------------------------------------- diff --git a/services/hama/pom.xml b/services/hama/pom.xml index 1d3f207..ec0684c 100644 --- a/services/hama/pom.xml +++ b/services/hama/pom.xml @@ -29,7 +29,7 @@ <version>0.8.1</version> <name>Apache Whirr Hama</name> <properties> - <hadoop.version>1.0.3</hadoop.version> + <hadoop.version>1.0.4</hadoop.version> <zookeeper.version>3.3.3</zookeeper.version> <osgi.import> !org.apache.whirr.service.hama*, http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties ---------------------------------------------------------------------- diff --git a/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties b/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties index 9848fac..e95cd47 100644 --- a/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties +++ b/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties @@ -25,4 +25,4 @@ whirr.credential=${sys:whirr.test.credential} whirr.hardware-min-ram=4096 whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.94.1/hbase-0.94.1.tar.gz -whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.3/hadoop-1.0.3.tar.gz +whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.4/hadoop-1.0.4.tar.gz http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/services/hbase/src/test/resources/whirr-hbase-test.properties ---------------------------------------------------------------------- diff --git a/services/hbase/src/test/resources/whirr-hbase-test.properties b/services/hbase/src/test/resources/whirr-hbase-test.properties index 7986716..6c01feb 100644 --- a/services/hbase/src/test/resources/whirr-hbase-test.properties +++ b/services/hbase/src/test/resources/whirr-hbase-test.properties @@ -23,6 +23,6 @@ whirr.identity=${sys:whirr.test.identity} whirr.credential=${sys:whirr.test.credential} whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.94.1/hbase-0.94.1.tar.gz -whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.3/hadoop-1.0.3.tar.gz +whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.4/hadoop-1.0.4.tar.gz http://git-wip-us.apache.org/repos/asf/whirr/blob/c1e9c109/services/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/services/yarn/pom.xml b/services/yarn/pom.xml index 64fd8a8..0163bd8 100644 --- a/services/yarn/pom.xml +++ b/services/yarn/pom.xml @@ -29,7 +29,7 @@ <version>0.8.1</version> <name>Apache Whirr YARN</name> <properties> - <hadoop.version>1.0.3</hadoop.version> + <hadoop.version>1.0.4</hadoop.version> <osgi.import> !org.apache.whirr.service.yarn*, org.apache.commons.configuration*;version="[1.6,2)",