You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2016/06/21 03:39:58 UTC

[08/28] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/670f2ea8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/670f2ea8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/670f2ea8

Branch: refs/heads/1.8
Commit: 670f2ea8ade31746194417f4774b7f522023404f
Parents: 519e5b7 f81a22e
Author: Josh Elser <el...@apache.org>
Authored: Mon Jun 20 18:22:49 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jun 20 18:22:49 2016 -0400

----------------------------------------------------------------------
 .../accumulo/core/rpc/TTimeoutTransport.java    | 24 ++++++++++++++------
 .../apache/accumulo/core/rpc/ThriftUtil.java    |  8 ++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------