From a948a5ef3493c26fc30a0a8f93d63cbd9497da3b Mon Sep 17 00:00:00 2001 From: toby Date: Mon, 22 Jan 2018 12:46:57 +0100 Subject: Rename NATted to NATed --- docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java | 2 +- .../src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 2 +- docker-api/src/main/resources/configdefinitions/docker.def | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker-api') diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java index 6fc9472a30e..9b9a5bf35d4 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java @@ -46,7 +46,7 @@ public interface Docker { Map getBlkioStats(); } - default boolean networkNATted() { + default boolean networkNATed() { return false; } diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index e180dcffe47..c4413de24f9 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -139,7 +139,7 @@ public class DockerImpl implements Docker { } @Override - public boolean networkNATted() { + public boolean networkNATed() { return config.networkNATted(); } diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def index 20b156a9a6d..b4585318cd8 100644 --- a/docker-api/src/main/resources/configdefinitions/docker.def +++ b/docker-api/src/main/resources/configdefinitions/docker.def @@ -15,4 +15,4 @@ readTimeoutMillis int default = 1800000 # 30 min isRunningLocally bool default = false imageGCMinTimeToLiveMinutes int default = 45 -networkNATted bool default = false +networkNATed bool default = false -- cgit v1.2.3