Merge branch '1.6'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be991c2a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be991c2a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be991c2a
Branch: refs/heads/master
Commit: be991c2a08e2234141f2586d4e71cf0fc37d5d88
Parents: 72587a4 57142e2
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Feb 11 12:54:38 2015 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Feb 11 12:54:38 2015 -0500
----------------------------------------------------------------------
pom.xml | 5 -----
start/pom.xml | 5 -----
test/pom.xml | 5 -----
3 files changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be991c2a/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5e8ef7d,39009fa..4a86a86
--- a/pom.xml
+++ b/pom.xml
@@@ -468,16 -451,6 +468,11 @@@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ <version>${htrace.version}</version>
+ </dependency>
+ <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- </dependency>
- <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<version>${powermock.version}</version>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be991c2a/start/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/be991c2a/test/pom.xml
----------------------------------------------------------------------
