Updated Branches: refs/heads/trunk 28af5122e -> ead68ad37
SQOOP-1053: Fix sqoop to work with Hadoop 2.0.4 alpha (Venkat Ranganathan via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/ead68ad3 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/ead68ad3 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/ead68ad3 Branch: refs/heads/trunk Commit: ead68ad37e1f7ecf03cba4718acbde8282887c9b Parents: 28af512 Author: Jarek Jarcec Cecho <[email protected]> Authored: Wed May 22 01:11:32 2013 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Wed May 22 01:11:32 2013 -0700 ---------------------------------------------------------------------- build.xml | 6 +++--- src/test/com/cloudera/sqoop/TestCompression.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/ead68ad3/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 1c33fee..636c103 100644 --- a/build.xml +++ b/build.xml @@ -76,15 +76,15 @@ <elseif> <equals arg1="${hadoopversion}" arg2="200" /> <then> - <property name="hadoop.version" value="2.0.0-alpha" /> + <property name="hadoop.version" value="2.0.4-alpha" /> <property name="hbase.version" value="0.94.2" /> <property name="zookeeper.version" value="3.4.2" /> - <property name="hadoop.version.full" value="2.0.0-alpha" /> + <property name="hadoop.version.full" value="2.0.4-alpha" /> </then> </elseif> <else> - <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100, or 200." /> + <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100 or 200." /> </else> </if> http://git-wip-us.apache.org/repos/asf/sqoop/blob/ead68ad3/src/test/com/cloudera/sqoop/TestCompression.java ---------------------------------------------------------------------- diff --git a/src/test/com/cloudera/sqoop/TestCompression.java b/src/test/com/cloudera/sqoop/TestCompression.java index 048b87d..841f054 100644 --- a/src/test/com/cloudera/sqoop/TestCompression.java +++ b/src/test/com/cloudera/sqoop/TestCompression.java @@ -163,8 +163,8 @@ public class TestCompression extends ImportJobTestCase { if (codec == null) { codec = new GzipCodec(); - ReflectionUtils.setConf(codec, getConf()); } + ReflectionUtils.setConf(codec, getConf()); Path p = new Path(getDataFilePath().toString() + codec.getDefaultExtension()); InputStream is = codec.createInputStream(fs.open(p));
