diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-14 14:41:18 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-14 14:41:18 +0200 |
| commit | 6ff3df19226036b8ee1bb559f9d73cab40e8d2a0 (patch) | |
| tree | 355a7b0623b58983ba655b868341fe479a22eb3d /docker-api/src | |
| parent | b7f9e7ceaef72489d76683537973b639f8895b84 (diff) | |
Remove carriage return
Diffstat (limited to 'docker-api/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/CounterWrapper.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/CounterWrapper.java index f6b398e83a2..7ea6e597aed 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/CounterWrapper.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/CounterWrapper.java @@ -36,4 +36,4 @@ public class CounterWrapper implements MetricValue { return value; } } -}
\ No newline at end of file +} diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def index 5242e9f432c..9a5c9222afc 100644 --- a/docker-api/src/main/resources/configdefinitions/docker.def +++ b/docker-api/src/main/resources/configdefinitions/docker.def @@ -13,4 +13,4 @@ connectTimeoutMillis int default = 100000 # 100 sec readTimeoutMillis int default = 1800000 # 30 min isRunningLocally bool default = false -imageGCMinTimeToLiveMinutes int default = 45
\ No newline at end of file +imageGCMinTimeToLiveMinutes int default = 45 diff --git a/docker-api/src/test/resources/simple-ipv6-server/src/fillmem.py b/docker-api/src/test/resources/simple-ipv6-server/src/fillmem.py index 3edb0086f18..d148eefb899 100644 --- a/docker-api/src/test/resources/simple-ipv6-server/src/fillmem.py +++ b/docker-api/src/test/resources/simple-ipv6-server/src/fillmem.py @@ -8,4 +8,4 @@ data = megabyte * int(sys.argv[1]) while True: time.sleep(1) - data.extend(megabyte)
\ No newline at end of file + data.extend(megabyte) |