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/bdded2cd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdded2cd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdded2cd Branch: refs/heads/master Commit: bdded2cd0204124d6d3ae1d69353718ee39ec12e Parents: b2cde19 64d66e1 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 24 13:26:12 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 24 13:26:12 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 -- .../accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java | 2 -- .../accumulo/core/client/mapreduce/AccumuloInputFormatTest.java | 2 +- .../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java | 2 +- .../java/org/apache/accumulo/test/continuous/ContinuousVerify.java | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
