You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/07/21 05:03:53 UTC
[2/5] incubator-trafodion git commit: Fix merge conflict.
Fix merge conflict.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/90b33b9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/90b33b9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/90b33b9f
Branch: refs/heads/master
Commit: 90b33b9f23173e88ca04a0fa00ac5a104bd10af7
Parents: 869af23
Author: Zalo Correa <za...@esgyn.com>
Authored: Mon Jul 17 20:10:59 2017 -0700
Committer: Zalo Correa <za...@esgyn.com>
Committed: Mon Jul 17 20:10:59 2017 -0700
----------------------------------------------------------------------
core/sqf/conf/log4cxx.monitor.mon.config | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90b33b9f/core/sqf/conf/log4cxx.monitor.mon.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.mon.config b/core/sqf/conf/log4cxx.monitor.mon.config
index 9fdb125..08901a1 100644
--- a/core/sqf/conf/log4cxx.monitor.mon.config
+++ b/core/sqf/conf/log4cxx.monitor.mon.config
@@ -25,13 +25,13 @@
trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
+# Logging Threshold
+log4j.threshhold=ALL
+
# Define the root logger to the system property "trafodion.root.logger".
trafodion.root.logger=INFO, monAppender
log4j.rootLogger=${trafodion.root.logger}
-# Logging Threshold
-log4j.threshhold=ALL
-
#
# Rolling File Appender
#