Updated Branches: refs/heads/1.4.5-SNAPSHOT 51dd80509 -> 394b2b29b refs/heads/1.5.1-SNAPSHOT 11ba435a4 -> a550169d1
ACCUMULO-1795 Default Hadoop 1.0 to 0.20.203.0. Signed-off-by: Eric Newton <eric.new...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e41581ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e41581ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e41581ea Branch: refs/heads/1.4.5-SNAPSHOT Commit: e41581eac8e01cb430706c4ac838127cb61d9176 Parents: 51dd805 Author: Bill Havanki <bhava...@cloudera.com> Authored: Thu Nov 21 16:16:08 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 26 14:54:40 2013 -0500 ---------------------------------------------------------------------- README | 7 ++++--- pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e41581ea/README ---------------------------------------------------------------------- diff --git a/README b/README index 674769d..f01048b 100644 --- a/README +++ b/README @@ -18,12 +18,12 @@ have maven configured to get Accumulo prerequisites from repositories. See the pom.xml file for the necessary components. Run "mvn package && mvn assembly:single -N". By default, -Accumulo compiles against Hadoop 1.0.4. To compile against a different version +Accumulo compiles against Hadoop 0.20.203.0. To compile against a different version that is compatible with Hadoop 1.0, specify hadoop.version on the command line, e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0". To compile against Hadoop 2.0, specify "-Dhadoop.profile=2.0". By default this uses 2.0.2-alpha. To compile against a different 2.0-compatible version, specify -the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=0.23.5". +the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=2.2.0". If you are running on another Unix-like operating system (OSX, etc) then you may wish to build the native libraries. They are not strictly necessary @@ -70,7 +70,8 @@ found in the same location on every machine in the cluster. You will need to have password-less ssh set up as described in the hadoop documentation. You will need to have hadoop installed and configured on your system. -Accumulo 1.4.5-SNAPSHOT has been tested with hadoop version 0.20.2. +Accumulo 1.4.5-SNAPSHOT has been tested with hadoop version 0.20.2 and +0.20.203.0. The example accumulo configuration files are placed in directories based on the memory footprint for the accumulo processes. If you are using native libraries http://git-wip-us.apache.org/repos/asf/accumulo/blob/e41581ea/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d664a5b..9856ae9 100644 --- a/pom.xml +++ b/pom.xml @@ -650,7 +650,7 @@ </property> </activation> <properties> - <hadoop.version>1.0.4</hadoop.version> + <hadoop.version>0.20.203.0</hadoop.version> <slf4j.version>1.4.3</slf4j.version> </properties> <dependencyManagement>