diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 1a8c41d099..8b9b8667cd 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -441,7 +441,7 @@ Release 2.7.0 - UNRELEASED
HADOOP-11294. Nfs3FileAttributes should not change the values of rdev,
nlink and size in the constructor. (Brandon Li via wheat9)
-Release 2.6.0 - 2014-11-15
+Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
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 85e3ae65bd..988027219f 100644
--- a/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
+++ b/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
@@ -12,6 +12,22 @@ Hadoop 2.6.0 Release Notes
Changes since Hadoop 2.5.1
+- YARN-2853.
+ Major bug reported by Jian He and fixed by Jian He
+ Killing app may hang while AM is unregistering
+
+- YARN-2846.
+ Blocker bug reported by Junping Du and fixed by Junping Du (nodemanager)
+ Incorrect persist exit code for running containers in reacquireContainer() that interrupted by NodeManager restart.
+
+- YARN-2843.
+ Major sub-task reported by Sushmitha Sreenivasan and fixed by Wangda Tan (resourcemanager)
+ NodeLabels manager should trim all inputs for hosts and labels
+
+- YARN-2841.
+ Critical sub-task reported by Jian He and fixed by Jian He (resourcemanager)
+ RMProxy should retry EOFException
+
- YARN-2834.
Blocker bug reported by Yesha Vora and fixed by Jian He
Resource manager crashed with Null Pointer Exception
@@ -25,7 +41,7 @@ Changes since Hadoop 2.5.1
Fix bugs of yarn queue CLI
- YARN-2826.
- Critical bug reported by sidharta seethana and fixed by Wangda Tan
+ Critical bug reported by Sidharta Seethana and fixed by Wangda Tan
User-Group mappings not updated by RM when a user is removed from a group.
- YARN-2825.
@@ -80,6 +96,10 @@
Changes since Hadoop 2.5.1
Major sub-task reported by Phil D'Amore and fixed by Wangda Tan (resourcemanager)
Resource Manager fails startup with HDFS label storage and secure cluster
+- YARN-2794.
+ Major bug reported by Jian He and fixed by Jian He
+ Fix log msgs about distributing system-credentials
+
- YARN-2790.
Critical bug reported by Tassapol Athiapinya and fixed by Jian He (nodemanager)
NM can't aggregate logs past HDFS delegation token expiry.
@@ -304,6 +324,10 @@ Changes since Hadoop 2.5.1
Major sub-task reported by Craig Welch and fixed by Craig Welch
Recalculate headroom more frequently to keep it accurate
+- YARN-2635.
+ Major bug reported by Wei Yan and fixed by Wei Yan
+ TestRM, TestRMRestart, TestClientToAMTokens should run with both CS and FS
+
- YARN-2632.
Blocker sub-task reported by Junping Du and fixed by Junping Du (nodemanager)
Document NM Restart feature
@@ -1000,6 +1024,10 @@ Changes since Hadoop 2.5.1
Major sub-task reported by Remus Rusanu and fixed by Remus Rusanu (nodemanager)
Implement secure Windows Container Executor
+- YARN-1964.
+ Major new feature reported by Arun C Murthy and fixed by Abin Shahab
+ Create Docker analog of the LinuxContainerExecutor in YARN
+
- YARN-1959.
Major bug reported by Sandy Ryza and fixed by Anubhav Dhoot
Fix headroom calculation in FairScheduler
@@ -1128,6 +1156,10 @@ Changes since Hadoop 2.5.1
Major sub-task reported by Ravi Gummadi and fixed by Varun Vasudev (nodemanager)
NodeManager should identify failed disks becoming good again
+- MAPREDUCE-6156.
+ Blocker bug reported by Sidharta Seethana and fixed by Junping Du
+ Fetcher - connect() doesn't handle connection refused correctly
+
- MAPREDUCE-6142.
Critical sub-task reported by Zhijie Shen and fixed by Zhijie Shen
Test failure in TestJobHistoryEventHandler and TestMRTimelineEventHandling
@@ -1404,6 +1436,18 @@ Changes since Hadoop 2.5.1
Minor improvement reported by Koji Noguchi and fixed by Akira AJISAKA (documentation , harchive)
harchive: Document how to unarchive
+- HDFS-7391.
+ Blocker bug reported by Robert Kanter and fixed by Robert Kanter (webhdfs)
+ Renable SSLv2Hello in HttpFS
+
+- HDFS-7387.
+ Critical bug reported by Brandon Li and fixed by Brandon Li (nfs)
+ NFS may only do partial commit due to a race between COMMIT and write
+
+- HDFS-7385.
+ Blocker bug reported by jiangyu and fixed by jiangyu (namenode)
+ ThreadLocal used in FSEditLog class causes FSImage permission mess up
+
- HDFS-7383.
Major bug reported by Tsz Wo Nicholas Sze and fixed by Tsz Wo Nicholas Sze (datanode)
DataNode.requestShortCircuitFdsForRead may throw NullPointerException
@@ -1952,10 +1996,6 @@ Changes since Hadoop 2.5.1
Trivial bug reported by Ray Chiang and fixed by Ray Chiang
Fix typos in log messages
-- HDFS-6938.
- Trivial bug reported by Charles Lamb and fixed by Charles Lamb (namenode)
- Cleanup javac warnings in FSNamesystem
-
- HDFS-6934.
Major sub-task reported by Arpit Agarwal and fixed by Chris Nauroth (datanode , hdfs-client)
Move checksum computation off the hot path when writing to RAM disk
@@ -3489,6 +3529,10 @@ Changes since Hadoop 2.5.1
Major bug reported by Allan Yan and fixed by Allan Yan (fs)
FsShell's Text command does not read avro data files stored on HDFS
+- HADOOP-9576.
+ Major bug reported by Jian He and fixed by Steve Loughran
+ Make NetUtils.wrapException throw EOFException instead of wrapping it as IOException
+
- HADOOP-9540.
Minor improvement reported by Hari and fixed by (fs/s3 , test)
Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 998a395c4d..e0ef0647d7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -424,7 +424,7 @@ Release 2.7.0 - UNRELEASED
HDFS-7358. Clients may get stuck waiting when using ByteArrayManager.
(szetszwo)
-Release 2.6.0 - 2014-11-15
+Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index c0105e6222..a8ca13ff5e 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -236,7 +236,7 @@ Release 2.7.0 - UNRELEASED
BUG FIXES
-Release 2.6.0 - 2014-11-15
+Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8f679fd64e..3235907a31 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -84,7 +84,7 @@ Release 2.7.0 - UNRELEASED
YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via
aw)
-Release 2.6.0 - 2014-11-15
+Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES