diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
| commit | 1db80c6ab30aafd0e8c3cc09091f9949e9488145 (patch) | |
| tree | e4534ee6925175563beb5c294976f70755903d02 /config-model/pom.xml | |
| parent | b1a1038d66df81646bed462295761d1aeed2c1e9 (diff) | |
| parent | 8372a883c5a5fa100f88fc9b80824359b5bb70cd (diff) | |
Merge branch 'master' into hakonhall/define-enable-logserver-flag
Diffstat (limited to 'config-model/pom.xml')
| -rw-r--r-- | config-model/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index 57dbadd94ab..965d97bb605 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -5,12 +5,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>config-model</artifactId> <packaging>container-plugin</packaging> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> |