You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2012/12/03 22:26:31 UTC
svn commit: r1416671 - in /hbase/trunk: ./ hbase-common/ hbase-server/
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/
Author: eclark
Date: Mon Dec 3 21:26:30 2012
New Revision: 1416671
URL: http://svn.apache.org/viewvc?rev=1416671&view=rev
Log:
HBASE-7187 Revert Dirty commit.
Removed:
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterListTmpl.jamon
Modified:
hbase/trunk/hbase-common/pom.xml
hbase/trunk/hbase-server/pom.xml
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/trunk/pom.xml
Modified: hbase/trunk/hbase-common/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/pom.xml?rev=1416671&r1=1416670&r2=1416671&view=diff
==============================================================================
--- hbase/trunk/hbase-common/pom.xml (original)
+++ hbase/trunk/hbase-common/pom.xml Mon Dec 3 21:26:30 2012
@@ -109,6 +109,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -133,6 +137,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -183,6 +191,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1416671&r1=1416670&r2=1416671&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Mon Dec 3 21:26:30 2012
@@ -276,10 +276,6 @@
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<type>test-jar</type>
</dependency>
@@ -481,6 +477,7 @@
<dependency>
<groupId>org.cloudera.htrace</groupId>
<artifactId>htrace</artifactId>
+ <version>1.49</version>
</dependency>
</dependencies>
<profiles>
Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1416671&r1=1416670&r2=1416671&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Mon Dec 3 21:26:30 2012
@@ -126,8 +126,6 @@ org.apache.hadoop.hbase.HBaseConfigurati
</div>
</%if>
- <h2>Backup Masters</h2>
- <& BackupMasterListTmpl; master = master &>
<h2>Region Servers</h2>
<& RegionServerListTmpl; master= master; servers = servers &>
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1416671&r1=1416670&r2=1416671&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Mon Dec 3 21:26:30 2012
@@ -51,7 +51,6 @@
<modules>
<module>hbase-server</module>
<module>hbase-protocol</module>
- <module>hbase-client</module>
<module>hbase-hadoop2-compat</module>
<module>hbase-hadoop1-compat</module>
<module>hbase-hadoop-compat</module>
@@ -848,7 +847,6 @@
<jersey.version>1.8</jersey.version>
<jruby.version>1.6.8</jruby.version>
<junit.version>4.10-HBASE-1</junit.version>
- <htrace.version>1.49</htrace.version>
<slf4j.version>1.4.3</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<mockito-all.version>1.9.0</mockito-all.version>
@@ -972,11 +970,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <artifactId>hbase-client</artifactId>
- <groupId>org.apache.hbase</groupId>
- <version>${project.version}</version>
- </dependency>
<!-- General dependencies -->
<dependency>
<groupId>io.netty</groupId>
@@ -1229,11 +1222,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.cloudera.htrace</groupId>
- <artifactId>htrace</artifactId>
- <version>${htrace.version}</version>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito-all.version}</version>