[7/7] git commit: Merge branch '1.6'

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

[7/7] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkTest.java Project: http://git-w

[7/7] git commit: Merge branch '1.6'

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

[7/7] git commit: Merge branch '1.6'

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