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/e898d597 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e898d597 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e898d597 Branch: refs/heads/master Commit: e898d597faa183da1fa0c0226a70afabf29ce092 Parents: 52f25e2 9cae048 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Dec 19 15:48:20 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Dec 19 15:48:20 2013 -0500 ---------------------------------------------------------------------- .../client/mapreduce/AbstractInputFormat.java | 254 ++++++++++--------- .../client/mapreduce/AccumuloOutputFormat.java | 5 +- .../mapreduce/lib/util/InputConfigurator.java | 12 +- .../server/master/state/TServerInstance.java | 16 +- .../org/apache/accumulo/tserver/Tablet.java | 17 +- .../apache/accumulo/tserver/TabletServer.java | 6 +- .../test/randomwalk/concurrent/CreateTable.java | 3 + 7 files changed, 172 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
