diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-20 15:31:15 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:22 +0100 |
| commit | c40265a5a0f399bc2e9a12025d0124edec7d0bf8 (patch) | |
| tree | 3062e6a21ead6d58ac7e7d92d4086d38c3b332d7 /config-model | |
| parent | 7b58424ddd4cdf0c2e963cd89bac83dcf8566381 (diff) | |
Remove further traces of rotationScheme.
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/containercluster.rnc | 3 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index fdb5b3193f5..a30f61809ad 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -72,8 +72,7 @@ AccessLog = element accesslog { attribute compressOnRotation { xsd:boolean }? & attribute symlinkName { string }? & - attribute rotationInterval { string }? & - attribute rotationScheme { string "date" | string "sequence" }? + attribute rotationInterval { string }? } SecretStore = element secret-store { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java index 817d9a943e0..fe81c18f9b0 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java @@ -67,11 +67,9 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { Element clusterElem = DomBuilderTest.parse( "<jdisc id='default' version='1.0'>", " <accesslog type='yapache' ", - " fileNamePattern='pattern' rotationInterval='interval'", - " rotationScheme='date' />", + " fileNamePattern='pattern' rotationInterval='interval' />", " <accesslog type='json' ", - " fileNamePattern='pattern' rotationInterval='interval'", - " rotationScheme='date' />", + " fileNamePattern='pattern' rotationInterval='interval' />", nodesXml, "</jdisc>" ); |