Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/904e957c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/904e957c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/904e957c Branch: refs/heads/master Commit: 904e957c49e92eee2961009305bc62c56db01a67 Parents: f85717c ef8c1ca Author: Josh Elser <els...@apache.org> Authored: Wed Dec 9 11:51:02 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Dec 9 11:51:02 2015 -0500 ---------------------------------------------------------------------- fate/src/main/java/org/apache/accumulo/fate/Fate.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/904e957c/fate/src/main/java/org/apache/accumulo/fate/Fate.java ----------------------------------------------------------------------
