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

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/bdb27e97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdb27e97 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdb27e97

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

Merge branch '1.7' into 1.8 Conflicts: test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http:

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

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/739577d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/739577d1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/739577d1

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

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/e68b8dbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e68b8dbc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e68b8dbc

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

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/271800c3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/271800c3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/271800c3

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

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/711b4211 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/711b4211 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/711b4211

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

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/24289e2c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24289e2c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24289e2c

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

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/ec69f299 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec69f299 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec69f299

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

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/c8621bbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8621bbc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8621bbc

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

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/135bf025 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/135bf025 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/135bf025

[3/4] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3444ef7c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3444ef7c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3444ef7c Branch:

[3/4] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Conflicts: test/src/main/java/org/apache/accumulo/test/ScanIteratorIT.java test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/a

[3/4] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59f51bab Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59f51bab Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59f51bab Branch:

[3/4] accumulo git commit: Merge branch '1.7'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/08449146/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 9797d7b,

[3/4] accumulo git commit: Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7

Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aea14c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aea14c7 Diff: http://gi