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/5a8a28af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a8a28af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a8a28af Branch: refs/heads/master Commit: 5a8a28af9e8084cd7d553d182d04bbd32059b080 Parents: cf309e5 8a34937 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Dec 3 16:15:27 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Dec 3 16:15:27 2013 -0500 ---------------------------------------------------------------------- .../core/client/mapred/InputFormatBase.java | 5 +- .../core/client/mapreduce/InputFormatBase.java | 4 +- .../org/apache/accumulo/core/conf/Property.java | 7 +- .../mapreduce/AccumuloInputFormatTest.java | 4 +- .../apache/accumulo/server/init/Initialize.java | 97 ++++++++++---------- .../accumulo/server/init/InitializeTest.java | 17 ++-- .../accumulo/tserver/log/MultiReaderTest.java | 6 +- 7 files changed, 74 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
