Author: todd
Date: Thu Mar 3 22:09:25 2011
New Revision: 1076828
URL: http://svn.apache.org/viewvc?rev=1076828&view=rev
Log:
Revert HBASE-3525 due to HBASE-3594 - rest server failing because of missing
asm jar
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/pom.xml
hbase/trunk/src/assembly/all.xml (contents, props changed)
hbase/trunk/src/main/java/ (props changed)
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/io/hfile/package.html
(props changed)
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/ipc/package.html
(props changed)
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/Hbase.html
(props changed)
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/index.html
(props changed)
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/style.css
(props changed)
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html
(props changed)
hbase/trunk/src/main/javadoc/overview.html (props changed)
hbase/trunk/src/main/resources/hbase-default.xml (props changed)
hbase/trunk/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties
(props changed)
hbase/trunk/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties
(props changed)
hbase/trunk/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
(props changed)
hbase/trunk/src/saveVersion.sh (props changed)
hbase/trunk/src/test/java/ (props changed)
hbase/trunk/src/test/resources/hbase-site.xml (props changed)
hbase/trunk/src/test/resources/log4j.properties (props changed)
hbase/trunk/src/test/resources/mapred-queues.xml (props changed)
hbase/trunk/src/test/resources/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties
(props changed)
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1076828&r1=1076827&r2=1076828&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Mar 3 22:09:25 2011
@@ -46,7 +46,6 @@ Release 0.91.0 - Unreleased
AlreadyBeingCreatedException
HBASE-3501 Remove the deletion limit in LogCleaner
HBASE-3500 Documentation update for replicatio
- HBASE-3525 mvn assembly is over-filling the hbase lib dir
HBASE-3531 When under global memstore pressure, dont try to flush
unflushable regions.
HBASE-3550 FilterList reports false positives (Bill Graham via Andrew
Modified: hbase/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1076828&r1=1076827&r2=1076828&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Thu Mar 3 22:09:25 2011
@@ -497,7 +497,6 @@
<!-- Dependencies -->
<avro.version>1.4.1</avro.version>
<commons-cli.version>1.2</commons-cli.version>
- <commons-el.version>1.0</commons-el.version>
<commons-codec.version>1.4</commons-codec.version>
<commons-httpclient.version>3.1</commons-httpclient.version><!-- pretty
outdated -->
<commons-lang.version>2.5</commons-lang.version>
@@ -548,11 +547,6 @@
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons-el.version}</version>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
Modified: hbase/trunk/src/assembly/all.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/assembly/all.xml?rev=1076828&r1=1076827&r2=1076828&view=diff
==============================================================================
--- hbase/trunk/src/assembly/all.xml (original)
+++ hbase/trunk/src/assembly/all.xml Thu Mar 3 22:09:25 2011
@@ -54,12 +54,8 @@
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <excludes>
- <exclude>org.apache.hbase:hbase</exclude>
- </excludes>
<unpack>false</unpack>
<scope>runtime</scope>
- <useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
</dependencySets>
</assembly>
Propchange: hbase/trunk/src/assembly/all.xml
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/main/java/
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/io/hfile/package.html
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/ipc/package.html
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/Hbase.html
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/index.html
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/doc-files/style.css
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/javadoc/org/apache/hadoop/hbase/thrift/package.html
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/main/javadoc/overview.html
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/main/resources/hbase-default.xml
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/saveVersion.sh
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/test/java/
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/test/resources/hbase-site.xml
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/test/resources/log4j.properties
('svn:mergeinfo' removed)
Propchange: hbase/trunk/src/test/resources/mapred-queues.xml
('svn:mergeinfo' removed)
Propchange:
hbase/trunk/src/test/resources/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties
('svn:mergeinfo' removed)
