diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2017-06-14 15:24:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 15:24:44 +0200 |
| commit | f9b18232d463b0e9f331279ce7f7d01143d64a2e (patch) | |
| tree | e021333387aa1be33ef6d47ce1c79c0b47a2bf85 /clustercontroller-core | |
| parent | 5736566c2dc551b4f059011e99f68eea1fb1a32b (diff) | |
| parent | 6ff3df19226036b8ee1bb559f9d73cab40e8d2a0 (diff) | |
Merge pull request #2770 from yahoo/bratseth/remove-carriage-return
Remove carriage return
Diffstat (limited to 'clustercontroller-core')
4 files changed, 4 insertions, 4 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java index 7304d1e673a..fe4ac802bce 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java @@ -301,4 +301,4 @@ public class VdsClusterHtmlRendrer { public Table createNewClusterHtmlTable(final String clusterName, final int slobrokGenerationCount) { return new Table(clusterName, slobrokGenerationCount); } -}
\ No newline at end of file +} diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java index 0d2f12dfdcd..4a1dd52a6bc 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java @@ -565,4 +565,4 @@ public class NodeStateChangeCheckerTest { return nodes; } -}
\ No newline at end of file +} diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfoTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfoTest.java index fd93df4b2dc..0c61c3f62c8 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfoTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfoTest.java @@ -104,4 +104,4 @@ public class HostInfoTest { assertThat(storageNodeByIndex.get(5).getOpsLatenciesOrNull().getPut().getLatencyMsSum(), is(25000L)); assertThat(storageNodeByIndex.get(5).getOpsLatenciesOrNull().getPut().getCount(), is(7L)); } -}
\ No newline at end of file +} diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java index a6789ae22e5..8653c33c14e 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java @@ -102,4 +102,4 @@ public interface Waiter { } } -}
\ No newline at end of file +} |