Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbbc0c54 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbbc0c54 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbbc0c54 Branch: refs/heads/master Commit: fbbc0c54bd12ad4ab0c8b4b8228451ca597da3b9 Parents: 1bcddcf 904e957 Author: Josh Elser <[email protected]> Authored: Wed Dec 9 11:51:17 2015 -0500 Committer: Josh Elser <[email protected]> Committed: Wed Dec 9 11:51:17 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/fbbc0c54/fate/src/main/java/org/apache/accumulo/fate/Fate.java ----------------------------------------------------------------------
