Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6111043f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6111043f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6111043f Branch: refs/heads/master Commit: 6111043f3fb84ecd28dd91b7be6956eff11ce675 Parents: 94b12f1 bd981c8 Author: Josh Elser <els...@apache.org> Authored: Thu Feb 12 19:18:30 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Feb 12 19:18:30 2015 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/impl/ThriftTransportPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6111043f/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java ----------------------------------------------------------------------
