diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 13:59:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 13:59:42 +0100 |
| commit | 9967338b1a3514830e92924d868046ee2cfc97db (patch) | |
| tree | 8f27590a3063bc592b85dc5d269e89491def2524 /standalone-container/src/main | |
| parent | e77379005bccd3d5009b1484038183a05856b4cd (diff) | |
| parent | c71969101b26dd4e29e5bef4c507550ebb47a9d9 (diff) | |
Merge pull request #4533 from vespa-engine/revert-4453-jvenstad/zone-cleanup-4
Revert "Jvenstad/zone cleanup 4"
Diffstat (limited to 'standalone-container/src/main')
| -rw-r--r-- | standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala index 1d4b83ce7d3..e1d5ba6577d 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala @@ -158,7 +158,7 @@ object StandaloneContainerApplication { val logger = new BaseDeployLogger val rawApplicationPackage = new FilesApplicationPackage.Builder(applicationPath.toFile).includeSourceFiles(true).preprocessedDir(preprocessedApplicationDir).build() // TODO: Needed until we get rid of semantic rules - val applicationPackage = rawApplicationPackage.preprocess(Zone.defaultZone(), new RuleConfigDeriver { + val applicationPackage = rawApplicationPackage.preprocess(Zone.defaultZone().id, new RuleConfigDeriver { override def derive(ruleBaseDir: String, outputDir: String): Unit = {} }, logger) validateApplication(applicationPackage) |