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/e6e85cfa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6e85cfa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6e85cfa Branch: refs/heads/master Commit: e6e85cfa1e50b094d4111f4a0a66de68f112c0fe Parents: 3d9336b c475af0 Author: Billie Rinaldi <[email protected]> Authored: Tue Jun 2 20:17:11 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Tue Jun 2 20:17:11 2015 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/TransportCachingIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
