You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/27 22:47:33 UTC
[05/17] accumulo git commit: Merge branch '1.5' into 1.6
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c9f33d09
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c9f33d09
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c9f33d09
Branch: refs/heads/1.6
Commit: c9f33d090ab887423714d673fb5e3e336274f33c
Parents: de2763e 11f108e
Author: Josh Elser <el...@apache.org>
Authored: Wed May 27 16:20:08 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed May 27 16:20:08 2015 -0400
----------------------------------------------------------------------
proxy/pom.xml | 5 +
.../org/apache/accumulo/proxy/ProxyServer.java | 16 ++-
.../apache/accumulo/proxy/ProxyServerTest.java | 114 +++++++++++++++++++
3 files changed, 131 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c9f33d09/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index 2bade1d,b75935a..ee106c7
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -82,24 -90,16 +82,29 @@@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <excludeFilterFile>src/main/findbugs/exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
<id>thrift</id>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c9f33d09/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------