Repository: hadoop Updated Branches: refs/heads/branch-2 214338bd6 -> 113f77830
HADOOP-12388. Fix components' version information in the web page About the Cluster. Contributed by Jun Gong. (cherry picked from commit d9c1fab2ec2930a011b7cca4a393881d39b8f6ec) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/113f7783 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/113f7783 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/113f7783 Branch: refs/heads/branch-2 Commit: 113f778303118d4838dea15c9c32a729cf909efa Parents: 214338b Author: Zhihai Xu <z...@apache.org> Authored: Tue Sep 8 13:06:36 2015 -0700 Committer: Zhihai Xu <z...@apache.org> Committed: Tue Sep 8 13:09:23 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/util/VersionInfo.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/113f7783/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3f5af85..88b86a7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -603,6 +603,9 @@ Release 2.8.0 - UNRELEASED HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter error message. (Wei Yan via ozawa) + HADOOP-12388. Fix components' version information in the web page + 'About the Cluster'. (Jun Gong via zxu) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/113f7783/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java index 9296d54..3297407 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java @@ -86,7 +86,7 @@ public class VersionInfo { } protected String _getBuildVersion(){ - return getVersion() + + return _getVersion() + " from " + _getRevision() + " by " + _getUser() + " source checksum " + _getSrcChecksum();
