You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/08 05:03:44 UTC

[48/53] [abbrv] git commit: Merge branch '1.6.0-SNAPSHOT'

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/1b4c49c6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b4c49c6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b4c49c6

Branch: refs/heads/ACCUMULO-378
Commit: 1b4c49c6946990ce792e511a79d5fb348d5c6702
Parents: 066043d 479a36b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Apr 7 20:43:50 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Apr 7 20:43:50 2014 -0400

----------------------------------------------------------------------
 assemble/build.sh                               |  8 +++----
 .../core/client/mapred/InputFormatBase.java     |  1 +
 .../client/mapreduce/AccumuloInputFormat.java   |  2 +-
 .../core/client/mapreduce/InputFormatBase.java  |  1 +
 .../EmptySplitsAccumuloInputFormat.java         | 10 ++++----
 .../org/apache/accumulo/fate/ReadOnlyStore.java | 22 ++++++++---------
 .../java/org/apache/accumulo/fate/TStore.java   | 16 ++++++-------
 .../apache/accumulo/master/util/FateAdmin.java  | 25 ++++++++++----------
 8 files changed, 43 insertions(+), 42 deletions(-)
----------------------------------------------------------------------