Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Michael Blow has abandoned this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Abandoned -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Michael Blow has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Code-Review-2 already done in https://asterix-gerrit.ics.uci.edu/#/c/3212/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Michael Blow has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: this can come in as part of the regular stabilization -> master mc, right? -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3975/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3975/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7965/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/204/ (16/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ssl-compression/35/ (15/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Contrib+1 Analytics Compatibility Tests Successful https://goo.gl/2ncZxx : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7965/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5425/ (14/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/548/ (13/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5525/ (12/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/510/ (9/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3169/ (4/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5158/ (7/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Analytics Compatibility Compilation Successful https://goo.gl/w1GtR3 : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5158/ (11/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/5067/ (10/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10639/ (2/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/5379/ (5/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/323/ (8/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5736/ (1/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5120/ (6/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Jenkins has posted comments on this change. Change subject: Merge commit 'refs/changes/92/3192/1' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/9109/ (3/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3193 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit 'refs/changes/92/3192/1'
Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3193
Change subject: Merge commit 'refs/changes/92/3192/1'
..
Merge commit 'refs/changes/92/3192/1'
Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
2 files changed, 0 insertions(+), 24 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/93/3193/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
index b521715..f7291cb 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
@@ -18,12 +18,9 @@
*/
package org.apache.hyracks.control.common.controllers;
-<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
import static org.apache.hyracks.control.common.config.OptionTypes.BOOLEAN;
-===
import java.io.File;
->>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
import java.io.Serializable;
import java.net.URL;
import java.util.function.Function;
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
index e781642..9e803b3 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
@@ -32,12 +32,9 @@
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
-<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
-===
import java.io.File;
import java.net.URI;
->>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
public class NCLogConfigurationFactory extends ConfigurationFactory {
private NCConfig config;
@@ -57,40 +54,22 @@
ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
.addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule",
"0 0 0 * * ?"))
.addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size",
"50M"));
-<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
-AppenderComponentBuilder defaultRoll =
-builder.newAppender("default", "RollingFile")
-.addAttribute("fileName", FileUtil.joinPath(logDir,
"nc-" + nodeId + ".log"))
-.addAttribute("filePattern",
-FileUtil.joinPath(logDir, "nc-" + nodeId +
"-%d{MM-dd-yy-ss}.log.gz"))
-.add(defaultLayout).addComponent(triggeringPolicy);
-===
AppenderComponentBuilder defaultRoll = builder.newAppender("default",
"RollingFile")
.addAttribute("fileName", new File(logDir, "nc-" + nodeId +
".log").getAbsolutePath())
.addAttribute("filePattern",
new File(logDir, "nc-" + nodeId +
"-%d{MM-dd-yy}.log.gz").getAbsolutePath())
.add(defaultLayout).addComponent(triggeringPolicy);
->>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
builder.add(defaultRoll);
// create the new logger
builder.add(builder.newRootLogger(Level.INFO).add(builder.newAppenderRef("default")));
LayoutComponentBuilder accessLayout =
builder.newLayout("PatternLayout").addAttribute("pattern", "%m%n");
-<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
-AppenderComponentBuilder accessRoll =
-builder.newAppender("access", "RollingFile")
-.addAttribute("fileName", FileUtil.joinPath(logDir,
"access-" + nodeId + ".log"))
-
