diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-05-12 14:17:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-12 14:17:16 +0200 |
commit | 86cfc2945d4711d47e224a6338372d11abe7e9f3 (patch) | |
tree | f6317afb09a371a1515d437350439be01cc9fea6 | |
parent | a5e31d496d4cb1594cbf55d8d268b8b7a5e0b2c3 (diff) | |
parent | b592f577da652a821bec4ce06aa60db6e046dbff (diff) |
Merge pull request #13225 from vespa-engine/kkraune/fix-tests
use English locale for strings
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 18dc0b217a3..bbfa8eba593 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -1,6 +1,7 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; +import java.util.Locale; import java.util.Objects; /** @@ -214,7 +215,7 @@ public class NodeResources { @Override public String toString() { - return String.format("[vcpu: %1$.1f, memory: %2$.1f Gb, disk %3$.1f Gb" + + return String.format(Locale.ENGLISH, "[vcpu: %1$.1f, memory: %2$.1f Gb, disk %3$.1f Gb" + (bandwidthGbps > 0 ? ", bandwidth: %4$.1f Gbps" : "") + ( ! diskSpeed.isDefault() ? ", disk speed: " + diskSpeed : "") + ( ! storageType.isDefault() ? ", storage type: " + storageType : "") + "]", |