Merge branch '1.6' into 1.7
Conflicts:
fate/src/main/java/org/apache/accumulo/fate/Fate.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1853d088
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1853d088
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1853d088
Branch: refs/heads/master
Commit: 1853d088e855a0c3f9345f6509c292814dcc61bb
Parents: 5947b42 e82c3f3
Author: Josh Elser <els...@apache.org>
Authored: Sat Nov 21 17:28:15 2015 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Sat Nov 21 17:28:15 2015 -0500
----------------------------------------------------------------------
fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1853d088/fate/src/main/java/org/apache/accumulo/fate/Fate.java
----------------------------------------------------------------------
diff --cc fate/src/main/java/org/apache/accumulo/fate/Fate.java
index cf2ab73,52c7b2f..8a3aaf7
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@@ -41,7 -37,8 +41,8 @@@ public class Fate<T>
private static final String EXCEPTION_PROP = "exception";
private static final String RETURN_PROP = "return";
- final private static Logger log = Logger.getLogger(Fate.class);
- private final Logger runnerLog = Logger.getLogger(TransactionRunner.class);
+ final private static Logger log = LoggerFactory.getLogger(Fate.class);
++ private final Logger runnerLog =
LoggerFactory.getLogger(TransactionRunner.class);
private TStore<T> store;
private T environment;
