You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/10/24 23:57:05 UTC
svn commit: r1188404 - in /hbase/branches/0.92: ./
src/main/jamon/org/apache/hbase/tmpl/master/
src/main/jamon/org/apache/hbase/tmpl/regionserver/
src/main/resources/hbase-webapps/master/
Author: stack
Date: Mon Oct 24 21:57:04 2011
New Revision: 1188404
URL: http://svn.apache.org/viewvc?rev=1188404&view=rev
Log:
HBASE-4437 Update hadoop in 0.92 (0.20.205?)
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/pom.xml
hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/branches/0.92/src/main/resources/hbase-webapps/master/table.jsp
hbase/branches/0.92/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
hbase/branches/0.92/src/main/resources/hbase-webapps/master/zk.jsp
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Oct 24 21:57:04 2011
@@ -691,6 +691,7 @@ Release 0.92.0 - Unreleased
HBASE-4292 Add a debugging dump servlet to the master and regionserver
(todd)
HBASE-4057 Implement HBase version of "show processlist" (Riley Patterson)
+ HBASE-4437 Update hadoop in 0.92 (0.20.205?)
Release 0.90.5 - Unreleased
Modified: hbase/branches/0.92/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/pom.xml?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/pom.xml (original)
+++ hbase/branches/0.92/pom.xml Mon Oct 24 21:57:04 2011
@@ -1222,7 +1222,7 @@
at revision 1034499 with this hdfs-895 patch:
https://issues.apache.org/jira/secure/attachment/12459473/hdfs-895-branch-20-append.txt
-->
- <hadoop.version>0.20-append-r1057313</hadoop.version>
+ <hadoop.version>0.20.205.0</hadoop.version>
</properties>
<dependencies>
<dependency>
Modified: hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon Mon Oct 24 21:57:04 2011
@@ -48,8 +48,11 @@ org.apache.hadoop.hbase.HTableDescriptor
<%java return; %>
</%if>
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
+ See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<title>HBase Master: <% master.getServerName().getHostAndPort() %></title>
@@ -241,4 +244,4 @@ org.apache.hadoop.hbase.HTableDescriptor
<tr><th>Total: </th><td>servers: <% deadServers.size() %></td></tr>
</table>
</%if>
-</%def>
\ No newline at end of file
+</%def>
Modified: hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon Mon Oct 24 21:57:04 2011
@@ -51,8 +51,11 @@ org.apache.hadoop.hbase.HRegionInfo;
int interval = regionServer.getConfiguration().getInt("hbase.regionserver.msginterval", 3000)/1000;
</%java>
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
+ See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<title>HBase Region Server: <% serverInfo.getServerAddress().getHostname() %>:<% serverInfo.getServerAddress().getPort() %></title>
Modified: hbase/branches/0.92/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/resources/hbase-webapps/master/table.jsp?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/branches/0.92/src/main/resources/hbase-webapps/master/table.jsp Mon Oct 24 21:57:04 2011
@@ -55,8 +55,11 @@
%>
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
+ See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<%
Modified: hbase/branches/0.92/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/resources/hbase-webapps/master/tablesDetailed.jsp?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/resources/hbase-webapps/master/tablesDetailed.jsp (original)
+++ hbase/branches/0.92/src/main/resources/hbase-webapps/master/tablesDetailed.jsp Mon Oct 24 21:57:04 2011
@@ -28,8 +28,11 @@
Configuration conf = master.getConfiguration();
%>
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
+ See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<title>HBase Master: <%= master.getServerName()%>%></title>
Modified: hbase/branches/0.92/src/main/resources/hbase-webapps/master/zk.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/resources/hbase-webapps/master/zk.jsp?rev=1188404&r1=1188403&r2=1188404&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/resources/hbase-webapps/master/zk.jsp (original)
+++ hbase/branches/0.92/src/main/resources/hbase-webapps/master/zk.jsp Mon Oct 24 21:57:04 2011
@@ -34,8 +34,11 @@
%>
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
+ See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<title>ZooKeeper Dump</title>