From aba8b6e540a31a0fbb488a0d111d5141fe523645 Mon Sep 17 00:00:00 2001
From: Konstantin Boudnik <cos@apache.org>
Date: Sat, 1 Jun 2013 20:07:03 +0000
Subject: [PATCH] Adding 2.0.5-alpha release to CHANGES.txt files of trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488587 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop-common/CHANGES.txt                 | 19 +++++++++++++++++--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 14 +++++++++++++-
 hadoop-mapreduce-project/CHANGES.txt          | 16 +++++++++++++++-
 hadoop-yarn-project/CHANGES.txt               | 16 ++++++++++++++--
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 21b8602acb..c252a67cbb 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -369,7 +369,7 @@ Trunk (Unreleased)
     HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
 
 
-Release 2.0.5-beta - UNRELEASED
+Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -743,7 +743,22 @@ Release 2.0.5-beta - UNRELEASED
 
     HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
 
-Release 2.0.4-alpha - 2013-04-25 
+Release 2.0.5-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+  HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
+  build issues. (Sangjin Lee via suresh)
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 1bd440b174..04ec0da1fb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -262,7 +262,7 @@ Trunk (Unreleased)
     HDFS-4687. TestDelegationTokenForProxyUser#testWebHdfsDoAs is flaky with
     JDK7. (Andrew Wang via atm)
 
-Release 2.0.5-beta - UNRELEASED
+Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -1042,6 +1042,18 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output 
     that ".snapshot" is a reserved name. (Jing Zhao via brandonli)
 
+Release 2.0.5-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a492c849f9..2a0f23073f 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -137,7 +137,7 @@ Trunk (Unreleased)
     MAPREDUCE-5191. TestQueue#testQueue fails with timeout on Windows. (Ivan
     Mitic via hitesh)
 
-Release 2.0.5-beta - UNRELEASED
+Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -493,6 +493,20 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable & 
     FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
 
+Release 2.0.5-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+  MAPREDUCE-5240 inside of FileOutputCommitter the initialized Credentials cache
+  appears to be empty. (vinodkv)
 
 Release 2.0.4-alpha - 2013-04-25
 
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3af104aea4..aa7b9de083 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -20,7 +20,7 @@ Trunk - Unreleased
     YARN-597. TestFSDownload fails on Windows due to dependencies on
     tar/gzip/jar tools. (Ivan Mitic via acmurthy) 
 
-Release 2.0.5-beta - UNRELEASED
+Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -444,7 +444,19 @@ Release 2.0.5-beta - UNRELEASED
     YARN-493. Fixed some shell related flaws in YARN on Windows. (Chris Nauroth
     via vinodkv)
 
-Release 2.0.4-alpha - 2013-04-25 
+Release 2.0.5-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES