Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5dba407c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5dba407c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5dba407c Branch: refs/heads/master Commit: 5dba407cce3da15900b0fbbecea234ee55943dbf Parents: 0bd62e3 e2efee6 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Feb 26 14:40:51 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Feb 26 14:40:51 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/fate/util/AddressUtil.java | 27 ++++++------ .../server/tabletserver/log/DfsLogger.java | 44 +++++++------------- .../server/watcher/MonitorLog4jWatcher.java | 10 +---- 3 files changed, 30 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
