Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bfc2a5b7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfc2a5b7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bfc2a5b7 Branch: refs/heads/master Commit: bfc2a5b7b2dbb452436074529cbdd1b32ab955a9 Parents: 5c576af a24a286 Author: Josh Elser <els...@apache.org> Authored: Mon Jun 20 22:38:32 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jun 20 22:38:32 2016 -0400 ---------------------------------------------------------------------- .../accumulo/core/rpc/TTimeoutTransport.java | 24 ++++++++++++++------ .../apache/accumulo/core/rpc/ThriftUtil.java | 8 ++++++- .../accumulo/server/util/TServerUtilsTest.java | 19 ++++++++++------ 3 files changed, 36 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bfc2a5b7/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java ----------------------------------------------------------------------
