summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2019-01-21 16:06:53 +0100
committerGitHub <noreply@github.com>2019-01-21 16:06:53 +0100
commit8372a883c5a5fa100f88fc9b80824359b5bb70cd (patch)
tree660ce3ef61f060b33bd97eac1185715606b8e2bd /node-admin
parent3722c1cdd91fce30d1c2538b2a8749d9321e194b (diff)
parenteb0b1134a66507e3bd8f09793c22cd824d01dff5 (diff)
Merge pull request #8198 from vespa-engine/7
7 MERGEOK
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/pom.xml4
-rw-r--r--node-admin/src/main/application/services.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index e1231f2585d..fda4acebfa0 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>com.yahoo.vespa</groupId>
<artifactId>parent</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>7-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>node-admin</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>7-SNAPSHOT</version>
<packaging>container-plugin</packaging>
<name>${project.artifactId}</name>
diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index f1cfeb69660..db00c686c99 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -3,7 +3,7 @@
<services version="1.0" xmlns:preprocess="properties">
<container id="node-admin" version="1.0">
<!-- Please update container test when changing this file -->
- <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" />
+ <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" symlinkName="access.log" />
<component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
<component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/>