You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/10/01 03:26:43 UTC

[8/8] git commit: Merge branch '1.6'

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 43ef53ed39be9312a0e2a3eab03e49bfd6896e2a
Parents: 2cac013 d3586ea
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Sep 30 21:22:08 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Sep 30 21:22:08 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/master/FateServiceHandler.java     | 2 +-
 .../apache/accumulo/test/functional/AccumuloInputFormatIT.java  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/43ef53ed/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------