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/923accb6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/923accb6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/923accb6
Branch: refs/heads/master
Commit: 923accb68d7c79467291b6adfca74b114178944e
Parents: bd4d190 c07e3d0
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Sat Dec 13 14:18:34 2014 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Sat Dec 13 14:18:34 2014 -0500
----------------------------------------------------------------------
.../minicluster/impl/CleanShutdownMacTest.java | 2 +-
pom.xml | 9 +++++----
.../java/org/apache/accumulo/master/Master.java | 16 ++++++++--------
3 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/923accb6/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/923accb6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 31601a1,f40a650..b0300af
--- a/pom.xml
+++ b/pom.xml
@@@ -124,9 -122,9 +124,10 @@@
<forkCount>1</forkCount>
<!-- overwritten in profiles hadoop-1 or hadoop-2 -->
<hadoop.version>2.2.0</hadoop.version>
+ <htrace.version>3.0.4</htrace.version>
<httpclient.version>3.1</httpclient.version>
- <java.ver>1.6</java.ver>
- <jetty.version>8.1.15.v20140411</jetty.version>
++ <java.ver>1.7</java.ver>
+ <jetty.version>9.1.5.v20140505</jetty.version>
<!-- the maven-release-plugin makes this recommendation, due to plugin
bugs -->
<maven.min-version>3.0.4</maven.min-version>
<!-- surefire/failsafe plugin option -->
http://git-wip-us.apache.org/repos/asf/accumulo/blob/923accb6/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
