Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58C3217FC1 for ; Fri, 31 Oct 2014 18:10:50 +0000 (UTC) Received: (qmail 79376 invoked by uid 500); 31 Oct 2014 18:10:50 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 79335 invoked by uid 500); 31 Oct 2014 18:10:50 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 79326 invoked by uid 99); 31 Oct 2014 18:10:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 18:10:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A6E329271D3; Fri, 31 Oct 2014 18:10:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: enis@apache.org To: commits@hbase.apache.org Message-Id: <6bff478fafb44ca98d85aa7117703a46@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HBASE-12390 Change revision style from svn to git Date: Fri, 31 Oct 2014 18:10:49 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master cacdb89e0 -> 997c1adc2 HBASE-12390 Change revision style from svn to git Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/997c1adc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/997c1adc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/997c1adc Branch: refs/heads/master Commit: 997c1adc2f211683708dbdd0de3168508c2f2724 Parents: cacdb89 Author: Enis Soztutar Authored: Fri Oct 31 11:10:38 2014 -0700 Committer: Enis Soztutar Committed: Fri Oct 31 11:10:38 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/util/VersionInfo.java | 2 +- .../src/main/resources/hbase-webapps/rest/rest.jsp | 2 +- .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 4 ++-- .../hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 12 +++++++++++- .../hadoop/hbase/monitoring/StateDumpServlet.java | 6 +++--- 5 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/997c1adc/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java index 79c8ac3..d02c5e9 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java @@ -93,7 +93,7 @@ public class VersionInfo { static String[] versionReport() { return new String[] { "HBase " + getVersion(), - "Source code repository " + getUrl() + " -r " + getRevision(), + "Source code repository " + getUrl() + " revision=" + getRevision(), "Compiled by " + getUser() + " on " + getDate(), "From source with checksum " + getSrcChecksum() }; http://git-wip-us.apache.org/repos/asf/hbase/blob/997c1adc/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp index 810569c..43895a8 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp @@ -86,7 +86,7 @@ String listenPort = conf.get("hbase.rest.port", "8080"); HBase Version - <%= VersionInfo.getVersion() %>, r<%= VersionInfo.getRevision() %> + <%= VersionInfo.getVersion() %>, revision=<%= VersionInfo.getRevision() %> HBase version and revision http://git-wip-us.apache.org/repos/asf/hbase/blob/997c1adc/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index d75406e..2f0451c 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -225,7 +225,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); HBase Version - <% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision + <% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision HBase Compiled @@ -239,7 +239,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); Hadoop Version - <% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %> + <% org.apache.hadoop.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.util.VersionInfo.getRevision() %> Hadoop version and revision http://git-wip-us.apache.org/repos/asf/hbase/blob/997c1adc/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 68b4b7d..8ee1193 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -132,7 +132,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; HBase Version - <% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %> + <% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %> HBase version and revision @@ -146,6 +146,16 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; HBase source MD5 checksum + Hadoop Version + <% org.apache.hadoop.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.util.VersionInfo.getRevision() %> + Hadoop version and revision + + + Hadoop Compiled + <% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %> + When Hadoop version was compiled and by whom + + Zookeeper Quorum <% regionServer.getZooKeeper().getQuorum() %> Addresses of all registered ZK servers http://git-wip-us.apache.org/repos/asf/hbase/blob/997c1adc/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/StateDumpServlet.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/StateDumpServlet.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/StateDumpServlet.java index 8b16438..e495e52 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/StateDumpServlet.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/StateDumpServlet.java @@ -38,10 +38,10 @@ public abstract class StateDumpServlet extends HttpServlet { protected void dumpVersionInfo(PrintWriter out) { VersionInfo.writeTo(out); - + out.println("Hadoop " + org.apache.hadoop.util.VersionInfo.getVersion()); - out.println("Subversion " + org.apache.hadoop.util.VersionInfo.getUrl() + " -r " + - org.apache.hadoop.util.VersionInfo.getRevision()); + out.println("Source code repository " + org.apache.hadoop.util.VersionInfo.getUrl() + + " revision=" + org.apache.hadoop.util.VersionInfo.getRevision()); out.println("Compiled by " + org.apache.hadoop.util.VersionInfo.getUser() + " on " + org.apache.hadoop.util.VersionInfo.getDate()); }