Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7a24d75 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7a24d75 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7a24d75 Branch: refs/heads/master Commit: f7a24d7516de880ba338a59d57346dbe82cf2dab Parents: 2e4f320 0712471 Author: Josh Elser <els...@apache.org> Authored: Tue Apr 5 11:19:23 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Apr 5 11:19:23 2016 -0400 ---------------------------------------------------------------------- .../core/client/impl/TabletServerBatchWriter.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7a24d75/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java ----------------------------------------------------------------------