Move jiras to the right section in CHANGES.txt and make it consistent with branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494429 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -9,9 +9,6 @@ Trunk (Unreleased)
 
   NEW FEATURES
     
-    HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child
-    hadoop client processes. (Yu Gao via llu)
-
     HADOOP-9509. Implement ONCRPC and XDR. (brandonli)
 
     HADOOP-9515. Add general interface for NFS and Mount. (brandonli)
@@ -131,12 +128,6 @@ Trunk (Unreleased)
     HADOOP-9075. FileContext#FSLinkResolver should be made static.
     (Arpit Agarwal via suresh)
 
-    HADOOP-9093. Move all the Exception in PathExceptions to o.a.h.fs package.
-    (suresh)
-
-    HADOOP-9162. Add utility to check native library availability.
-    (Binglin Chang via suresh)
-
     HADOOP-9277. Improve javadoc for FileContext. (Andrew Wang via suresh)
 
     HADOOP-9258 Add stricter tests to FileSystemContractTestBase (stevel)
@@ -156,12 +147,6 @@ Trunk (Unreleased)
 
     HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
 
-    HADOOP-9041. FsUrlStreamHandlerFactory could cause an infinite loop in
-    FileSystem initialization. (Yanbo Liang and Radim Kolar via llu)
-
-    HADOOP-8418. Update UGI Principal classes name for running with
-    IBM JDK on 64 bits Windows.  (Yu Gao via eyang)
-
     HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.
     (Devaraj K via umamahesh)
 
@@ -287,9 +272,6 @@ Trunk (Unreleased)
     required context item is not configured
     (Brahma Reddy Battula via harsh)
 
-    HADOOP-3957. Change MutableQuantiles to use a shared thread for rolling
-    over metrics. (Andrew Wang via todd)
-
     HADOOP-8386. hadoop script doesn't work if 'cd' prints to stdout
     (default behavior in some bash setups (esp. Ubuntu))
     (Chiristopher Berner and Andy Isaacson via harsh)
@@ -300,9 +282,6 @@ Trunk (Unreleased)
     HADOOP-8918. test-patch.sh is parsing modified files wrong.
     (Raja Aluri via suresh)
 
-    HADOOP-8589 ViewFs tests fail when tests and home dirs are nested.
-    (sanjay Radia)
-
     HADOOP-8974. TestDFVariations fails on Windows. (Chris Nauroth via suresh)
 
     HADOOP-9037. Bug in test-patch.sh and precommit build process (Kihwal Lee
@@ -351,9 +330,6 @@ Trunk (Unreleased)
 
     HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay Radia)
 
-    HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
-
-
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -798,7 +774,7 @@ Release 2.1.0-beta - UNRELEASED
     HADOOP-9553. TestAuthenticationToken fails on Windows.
     (Arpit Agarwal via suresh)
 
-    HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe)
+    HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe)
 
     HADOOP-9131. Turn off TestLocalFileSystem#testListStatusWithColons on
     Windows. (Chris Nauroth via suresh)
@@ -809,6 +785,9 @@ Release 2.1.0-beta - UNRELEASED
     HADOOP-8982. TestSocketIOWithTimeout fails on Windows.
     (Chris Nauroth via suresh)
 
+    HADOOP-8958. ViewFs:Non absolute mount name failures when running 
+    multiple tests on Windows. (Chris Nauroth via suresh)
+
     HADOOP-9599. hadoop-config.cmd doesn't set JAVA_LIBRARY_PATH correctly.
     (Mostafa Elhemali via ivanmi)
 
@@ -870,6 +849,9 @@ Release 2.0.3-alpha - 2013-02-06
 
   NEW FEATURES
 
+    HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child
+    hadoop client processes. (Yu Gao via llu)
+
     HADOOP-8597. Permit FsShell's text command to read Avro files.
     (Ivan Vladimirov Ivanov via cutting)
 
@@ -896,6 +878,9 @@ Release 2.0.3-alpha - 2013-02-06
 
     HADOOP-8736. Add Builder for building RPC server. (Brandon Li via Suresh)
 
+    HDFS-3957. Change MutableQuantiles to use a shared thread for rolling
+    over metrics. (Andrew Wang via todd)
+
     HADOOP-8851. Use -XX:+HeapDumpOnOutOfMemoryError JVM option in the forked
     tests. (Ivan A. Veselovsky via atm)
 
@@ -923,7 +908,7 @@ Release 2.0.3-alpha - 2013-02-06
     HADOOP-8929. Add toString, other improvements for SampleQuantiles (todd)
 
     HADOOP-8922. Provide alternate JSONP output for JMXJsonServlet to allow
-    javascript in browser dashboard (Damien Hardy via bobby)
+    javascript in browser (Damien Hardy via bobby)
 
     HADOOP-8931. Add Java version to startup message. (eli)
 
@@ -955,6 +940,9 @@ Release 2.0.3-alpha - 2013-02-06
 
     HADOOP-9035. Generalize setup of LoginContext (daryn via bobby)
 
+    HADOOP-9093. Move all the Exception in PathExceptions to o.a.h.fs package.
+    (suresh)
+
     HADOOP-9042. Add a test for umask in FileSystemContractBaseTest.
     (Colin McCabe via eli)
 
@@ -969,6 +957,9 @@ Release 2.0.3-alpha - 2013-02-06
 
     HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu)
 
+    HADOOP-9162. Add utility to check native library availability.
+    (Binglin Chang via suresh)
+
     HADOOP-9173. Add security token protobuf definition to common and
     use it in hdfs. (suresh)
 
@@ -1003,6 +994,12 @@ Release 2.0.3-alpha - 2013-02-06
 
   BUG FIXES
 
+    HADOOP-9041. FsUrlStreamHandlerFactory could cause an infinite loop in
+    FileSystem initialization. (Yanbo Liang and Radim Kolar via llu)
+
+    HADOOP-8418. Update UGI Principal classes name for running with
+    IBM JDK on 64 bits Windows.  (Yu Gao via eyang)
+
     HADOOP-8795. BASH tab completion doesn't look in PATH, assumes path to
     executable is specified. (Sean Mackrory via atm)
 
@@ -1015,6 +1012,9 @@ Release 2.0.3-alpha - 2013-02-06
     HADOOP-8791. Fix rm command documentation to indicte it deletes
     files and not directories. (Jing Zhao via suresh)
 
+    HADOOP-8855. SSL-based image transfer does not work when Kerberos
+    is disabled. (todd via eli)
+
     HADOOP-8616. ViewFS configuration requires a trailing slash. (Sandy Ryza
     via atm)
 
@@ -1061,9 +1061,6 @@ Release 2.0.3-alpha - 2013-02-06
     HADOOP-9064. Augment DelegationTokenRenewer API to cancel the tokens on 
     calls to removeRenewAction. (kkambatl via tucu)
 
-    HADOOP-8958. ViewFs:Non absolute mount name failures when running 
-    multiple tests on Windows. (Chris Nauroth via suresh)
-
     HADOOP-9103. UTF8 class does not properly decode Unicode characters
     outside the basic multilingual plane. (todd)
 
@@ -1106,6 +1103,9 @@ Release 2.0.3-alpha - 2013-02-06
     
     HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI. (tomwhite)
 
+    HADOOP-8589 ViewFs tests fail when tests and home dirs are nested.
+    (sanjay Radia)
+
     HADOOP-9193. hadoop script can inadvertently expand wildcard arguments
     when delegating to hdfs script. (Andy Isaacson via todd)
 
@@ -1115,6 +1115,8 @@ Release 2.0.3-alpha - 2013-02-06
     HADOOP-8857. hadoop.http.authentication.signature.secret.file docs 
     should not state that secret is randomly generated. (tucu)
 
+    HADOOP-9190. packaging docs is broken. (Andy Isaacson via tgraves)
+
     HADOOP-9221. Convert remaining xdocs to APT. (Andy Isaacson via atm)
 
     HADOOP-8981. TestMetricsSystemImpl fails on Windows. (Xuan Gong via suresh)
@@ -1134,7 +1136,6 @@ Release 2.0.3-alpha - 2013-02-06
     HADOOP-9289. FsShell rm -f fails for non-matching globs. (Daryn Sharp via
     suresh)
 
-
 Release 2.0.2-alpha - 2012-09-07 
 
   INCOMPATIBLE CHANGES
@@ -1421,8 +1422,6 @@ Release 2.0.2-alpha - 2012-09-07
 
     HADOOP-8781. hadoop-config.sh should add JAVA_LIBRARY_PATH to LD_LIBRARY_PATH. (tucu)
 
-    HADOOP-8855. SSL-based image transfer does not work when Kerberos is disabled. (todd via eli)
-
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active