Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d99158ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d99158ff
Diff:
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f289ae2a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f289ae2a
Diff:
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3cf49b96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3cf49b96
Diff:
Merge branch '1.7' into 1.8
-sours merge, since 1.7 and 1.8 have different classpath needs for ACCUMULO-4467
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ab49808
Tree:
Merge branch '1.7' into 1.8-up
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fa8177ba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fa8177ba
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/757dedf7/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index