You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2016/02/04 09:07:24 UTC
[3/3] hadoop git commit: HDFS-9629. Update the footer of Web UI to
show year 2016 (Contributed by Xiao Chen and Vinayakumar B)
HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B)
(cherry picked from commit ddcd6954d03d3caadc8b69f7b886a3a17c3c9d0c)
(cherry picked from commit 8cdfdbf815bf89eee3184ec7cd00e1924c1ea316)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea517acf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea517acf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea517acf
Branch: refs/heads/branch-2.6
Commit: ea517acfb6eb414e85be32b21d6240301744a306
Parents: 89bfc88
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Feb 4 13:18:26 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Feb 4 13:34:54 2016 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 ++++
.../hadoop-hdfs/src/main/webapps/datanode/index.html | 2 +-
.../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 2 +-
.../hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 2 +-
.../hadoop-hdfs/src/main/webapps/journal/index.html | 2 +-
.../hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +-
hadoop-project/pom.xml | 3 +++
8 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d087e3c..b62ce3d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -8,6 +8,9 @@ Release 2.6.5 - UNRELEASED
IMPROVEMENTS
+ HDFS-9629. Update the footer of Web UI to show year 2016
+ (Xiao Chen and Vinayakumar B via vinayakumarb)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 4b1d154..565a065 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -400,6 +400,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<exclude name="**/proto-*-web.xml"/>
</fileset>
</copy>
+ <replace dir="${project.build.directory}/webapps" value="${release-year}">
+ <include name="**/*.html"/>
+ <replacetoken>{release-year-token}</replacetoken>
+ </replace>
</target>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
index 04cb703..a88bc9b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html
@@ -47,7 +47,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
+ <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 87add23..28df60e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -65,7 +65,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
+ <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div>
<div class="col-xs-1 pull-right"><a style="color: #ddd" href="dfshealth.jsp">Legacy UI</a></div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
index e1fdfa3..94d073d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
@@ -99,7 +99,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
+ <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html
index 5eabf64..72ab2cc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html
@@ -47,7 +47,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
+ <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
index d7d3cd4..9dbff5d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
@@ -53,7 +53,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
+ <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea517acf/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index b57271f..bcac500 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -30,6 +30,9 @@
<packaging>pom</packaging>
<properties>
+ <!-- Set the Release year during release -->
+ <release-year>2016</release-year>
+
<failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>