Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3b862d8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3b862d8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3b862d8 Branch: refs/heads/master Commit: a3b862d82fff3c094e13d0302942e15cd2c55bb2 Parents: afd31ed f85717c Author: Josh Elser <els...@apache.org> Authored: Fri Dec 4 16:24:17 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Dec 4 16:24:17 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/rpc/TTimeoutTransport.java | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
