From b26cb2ba6fcc6100969c537e3c49a098baec4f1f Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Thu, 9 Feb 2012 19:53:22 +0000 Subject: [PATCH] svn merge -c 1242485 from trunk for HADOOP-7923. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242490 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-yarn/hadoop-yarn-site/src/site/site.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f4c22a2a8ca..c73112a567b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -8,6 +8,9 @@ Release 0.23.2 - UNRELEASED HADOOP-8032. mvn site:stage-deploy should be able to use the scp protocol to stage documents (Ravi Prakash via tgraves) + HADOOP-7923. Automate the updating of version numbers in the doc system. + (szetszwo) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml index d31b426ecfd..1296cea12cf 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml @@ -11,7 +11,7 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + org.apache.maven.skins