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

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

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

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

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

Merge branch '1.7' Conflicts: test/src/main/java/org/apache/accumulo/test/ShellServerIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7aee563 Tree:

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

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

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