You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/10/02 00:24:12 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/1.6' into 1.6
Merge remote-tracking branch 'origin/1.6' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c90ee9a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c90ee9a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c90ee9a
Branch: refs/heads/1.6
Commit: 3c90ee9a86691f2d7ee759aa313d9515323680ca
Parents: c5afc5a d3586ea
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Oct 1 18:22:44 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Oct 1 18:22:44 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/master/FateServiceHandler.java | 2 +-
.../java/org/apache/accumulo/tserver/RootFiles.java | 2 +-
.../apache/accumulo/test/functional/SlowIterator.java | 13 ++++++-------
.../test/functional/AccumuloInputFormatIT.java | 4 +++-
.../apache/accumulo/test/functional/ExamplesIT.java | 3 ++-
5 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------