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:30 UTC

[4/5] git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0559d9ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0559d9ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0559d9ce

Branch: refs/heads/master
Commit: 0559d9ceb0c964af8530f09eda4a2a2e753c8630
Parents: 404f571 43ef53e
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Oct 1 18:22:53 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Oct 1 18:22:53 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/master/FateServiceHandler.java |  2 +-
 .../org/apache/accumulo/tserver/tablet/RootFiles.java  |  2 +-
 .../apache/accumulo/test/functional/SlowIterator.java  | 13 ++++++-------
 .../test/functional/AccumuloInputFormatIT.java         |  5 ++---
 .../apache/accumulo/test/functional/ExamplesIT.java    |  3 ++-
 5 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------