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/9496199d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9496199d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9496199d Branch: refs/heads/master Commit: 9496199d06b2530fe086956645582feec125ab4e Parents: 353badb ecdd852 Author: Keith Turner <ktur...@apache.org> Authored: Thu Jan 23 12:20:08 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Jan 23 12:20:08 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/fate/util/AddressUtilTest.java | 4 ++-- .../accumulo/server/master/state/DeadServerList.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
