Merge branch '1.5.1-SNAPSHOT' into 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/182f1526 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/182f1526 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/182f1526 Branch: refs/heads/master Commit: 182f1526097e0b13d5b1f0e38bdda862c7fb4bb6 Parents: e7e5c00 fbed7af Author: Mike Drob <md...@cloudera.com> Authored: Thu Jan 23 09:23:01 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Thu Jan 23 09:23:01 2014 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
