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

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

Merge branch '1.6' Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-u

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

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

Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/Property.java server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/a

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