diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2018-02-02 08:34:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 08:34:55 +0100 |
| commit | 354ae869c8197c1ee433827de420ea6d54d89899 (patch) | |
| tree | 9ec5fb0f75e301e4a8ccc95d39a291bf30dc0e4f /configserver | |
| parent | 73555da8073d121ca367b51a1fd38193a47982f3 (diff) | |
| parent | de2a9faf6aaf02a129af5d197eede6a09c7712e5 (diff) | |
Merge pull request #4854 from vespa-engine/hmusum/remove-templates-dir-from-app-package
Remove templates dir, not supported in Vespa 6
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java index c9c6ef4b428..68704eeb66a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java @@ -180,10 +180,6 @@ public class ZooKeeperClient { getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH)); writeFile(app.getFile(Path.fromString(ApplicationPackage.VALIDATION_OVERRIDES.getName())), getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH)); - - writeDir(app.getFile(Path.fromString(ApplicationPackage.TEMPLATES_DIR)), - getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH), - true); writeDir(app.getFile(ApplicationPackage.RULES_DIR), getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH).append(ApplicationPackage.RULES_DIR), srFilter, true); |