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:09:23 UTC
[2/2] 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)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6ee66be2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ee66be2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ee66be2
Branch: refs/heads/branch-2
Commit: 6ee66be2fa9ecbf13ba4f134c1faac63ad179ff8
Parents: 99966b1
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:38:26 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/6ee66be2/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 5a1fc5f..4be5b12 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2998,6 +2998,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/6ee66be2/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 9df5d10..2d7032f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -277,6 +277,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/6ee66be2/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 aeb61c2..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, 2015.</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/6ee66be2/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 f513139..7ad38d7 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
@@ -68,7 +68,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2015.</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/6ee66be2/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 8bfc0c9..b68cac2 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
@@ -165,7 +165,7 @@
<div class="row">
<hr />
- <div class="col-xs-2"><p>Hadoop, 2015.</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/6ee66be2/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 4d658c4..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, 2015.</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/6ee66be2/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 72f3ff7..3db97df 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, 2015.</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/6ee66be2/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 50e6d2c..55b2256 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>
<jetty.version>6.1.26</jetty.version>