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

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

Merge branch '1.6' Conflicts: core/src/main/scripts/generate-thrift.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/984c6b86 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/984c6b86 Diff: http://gi

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

Merge branch '1.6' Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: htt

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

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