From 0ac698864dbaba31806fbf16cb06b55bea792353 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Fri, 24 Oct 2014 14:23:43 -0700 Subject: [PATCH] Fix CHANGES.txt for HADOOP-112321 and HADOOP-10748. --- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c9c4246ee25..a22b760c3cf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -135,6 +135,8 @@ Trunk (Unreleased) HADOOP-11188. hadoop-azure: automatically expand page blobs when they become full. (Eric Hanson via cnauroth) + HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. @@ -327,8 +329,6 @@ Trunk (Unreleased) HADOOP-10996. Stop violence in the *_HOME (aw) - HADOOP-10748. HttpServer2 should not load JspServlet. (wheat9) - HADOOP-11033. shell scripts ignore JAVA_HOME on OS X. (aw) HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked @@ -359,7 +359,7 @@ Release 2.7.0 - UNRELEASED HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError. (Yongjun Zhang via wang) - HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9) + HADOOP-10748. HttpServer2 should not load JspServlet. (wheat9) OPTIMIZATIONS