Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc0c5623 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc0c5623 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc0c5623 Branch: refs/heads/master Commit: fc0c5623da0f869ba8477a5487f211eed1502638 Parents: e716e49 7b3567f Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Feb 14 12:34:21 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Feb 14 12:34:21 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/client/Instance.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
