[4/8] accumulo git commit: Merge branch '1.7' into 1.8

2017-06-12 Thread ctubbsii
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:

[4/8] accumulo git commit: Merge branch '1.7' into 1.8

2017-01-04 Thread elserj
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:

[4/8] accumulo git commit: Merge branch '1.7' into 1.8

2016-10-11 Thread ctubbsii
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:

[4/8] accumulo git commit: Merge branch '1.7' into 1.8

2016-09-22 Thread busbey
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:

[4/8] accumulo git commit: Merge branch '1.7' into 1.8-up

2016-07-21 Thread elserj
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:

[4/8] accumulo git commit: Merge branch '1.7' into 1.8

2016-07-11 Thread elserj
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