Merge branch '1.7' into 1.8
Conflicts:
test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cae07900
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cae07900
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cae07900
Branch: refs/heads/master
Commit: cae07900b7c4d6b704680ce29bb7eae6acdbb059
Parents: 6e9f1f7 771475a
Author: Christopher Tubbs <[email protected]>
Authored: Wed May 3 16:26:55 2017 -0400
Committer: Christopher Tubbs <[email protected]>
Committed: Wed May 3 16:26:55 2017 -0400
----------------------------------------------------------------------
.../accumulo/core/client/impl/TabletServerBatchWriter.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cae07900/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
