From eb9010719e2debe5c55a20e05c793a47e7dc3ac1 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 5 Feb 2014 05:44:45 +0000 Subject: [PATCH] HADOOP-10273. Merging r1564638 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564639 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 82933d9c56e..109ed94c2e8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -24,6 +24,8 @@ Release 2.4.0 - UNRELEASED HADOOP-10085. CompositeService should allow adding services while being inited. (Steve Loughran via kasha) + HADOOP-10273. Fix 'mvn site'. (Arpit Agarwal) + Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/pom.xml b/pom.xml index 9a3bbc8d1e0..ae9ac416896 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.apache.maven.plugins maven-site-plugin - 3.2 + 3.3 org.apache.maven.wagon @@ -222,7 +222,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs maven-site-plugin - 3.0 + 3.3 attach-descriptor