diff --git a/.gitattributes b/.gitattributes index af960483d22..9a4ca702992 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,5 +15,6 @@ *.bat text eol=crlf *.cmd text eol=crlf +*.vcxproj text merge=union eol=crlf *.csproj text merge=union eol=crlf *.sln text merge=union eol=crlf diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a781e320495..56a2c740754 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -315,9 +315,6 @@ Release 2.3.0 - UNRELEASED HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe) - HADOOP-9758. Provide configuration option for FileSystem/FileContext - symlink resolution. (Andrew Wang via Colin Patrick McCabe) - HADOOP-9848. Create a MiniKDC for use with security testing. (ywskycn via tucu) @@ -342,6 +339,24 @@ Release 2.3.0 - UNRELEASED HADOOP-10006. Compilation failure in trunk for o.a.h.fs.swift.util.JSONUtil (Junping Du via stevel) + HADOOP-9063. enhance unit-test coverage of class + org.apache.hadoop.fs.FileUtil (Ivan A. Veselovsky via jlowe) + + HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, + org.apache.hadoop.util.hash (Vadim Bondarev via jlowe) + + HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy (Vadim + Bondarev, Andrey Klochkov and Nathan Roberts via jlowe) + + HADOOP-9199. Cover package org.apache.hadoop.io with unit tests (Andrey + Klochkov via jeagles) + + HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules + (Ivan A. Veselovsky via daryn) + + HADOOP-9494. Excluded auto-generated and examples code from clover reports + (Andrey Klochkov via jeagles) + OPTIMIZATIONS HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn) @@ -384,7 +399,7 @@ Release 2.3.0 - UNRELEASED HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe) -Release 2.2.0 - UNRELEASED +Release 2.2.1 - UNRELEASED INCOMPATIBLE CHANGES @@ -392,11 +407,28 @@ Release 2.2.0 - UNRELEASED IMPROVEMENTS + HADOOP-10046. Print a log message when SSL is enabled. + (David S. Wang via wang) + OPTIMIZATIONS BUG FIXES -Release 2.1.2 - UNRELEASED + HADOOP-10028. Malformed ssl-server.xml.example. (Haohui Mai via jing9) + + HADOOP-10030. FsShell -put/copyFromLocal should support Windows local path. + (Chuan Liu via cnauroth) + + HADOOP-10031. FsShell -get/copyToLocal/moveFromLocal should support Windows + local path. (Chuan Liu via cnauroth) + + HADOOP-10039. Add Hive to the list of projects using + AbstractDelegationTokenSecretManager. (Haohui Mai via jing9) + + HADOOP-10040. hadoop.cmd in UNIX format and would not run by default on + Windows. (cnauroth) + +Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES @@ -410,6 +442,12 @@ Release 2.1.2 - UNRELEASED HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza) + HADOOP-9758. Provide configuration option for FileSystem/FileContext + symlink resolution. (Andrew Wang via Colin Patrick McCabe) + + HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector + (todd) + OPTIMIZATIONS BUG FIXES @@ -420,6 +458,12 @@ Release 2.1.2 - UNRELEASED HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem. (Andrew Wang via Colin Patrick McCabe) + HADOOP-10003. HarFileSystem.listLocatedStatus() fails. + (Jason Dere and suresh via suresh) + + HADOOP-10017. Fix NPE in DFSClient#getDelegationToken when doing Distcp + from a secured cluster to an insecured cluster. (Haohui Mai via jing9) + Release 2.1.1-beta - 2013-09-23 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 7b11971f458..939ce20094d 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -464,6 +464,10 @@ src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.c src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc_encoder.h src/test/java/org/apache/hadoop/fs/test-untar.tgz + src/test/resources/test.har/_SUCCESS + src/test/resources/test.har/_index + src/test/resources/test.har/_masterindex + src/test/resources/test.har/part-0 diff --git a/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example b/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example index 4b363ff21f7..02d300cd79f 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example +++ b/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example @@ -44,6 +44,7 @@ 10000 Truststore reload check interval, in milliseconds. Default value is 10000 (10 seconds). + diff --git a/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html b/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html index 3494a97e8d2..efbaeae4b14 100644 --- a/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html +++ b/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html @@ -15,6 +15,622 @@ limitations under the License. --> +Hadoop 2.2.0 Release Notes + + + +

Hadoop 2.2.0 Release Notes

+These release notes include new developer and user-facing incompatibilities, features, and major improvements. + +

Changes since Hadoop 2.1.1-beta

+
+ + Hadoop 2.1.1-beta Release Notes