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

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java s

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

Merge branch '1.6' into 1.7 Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java test/src/main/java/org/apache/accumulo/test/randomwalk/conc

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

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

[4/4] accumulo git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java Project: http://git-wip-us.apache

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

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