From 5c2a5f2e37063f9a89bec0f16c8f87223dd734be Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 8 Nov 2018 12:24:10 -0500 Subject: [PATCH] Adjust BWC version on OS pretty name This commit adjusts the BWC version the OS pretty name field on OsInfo now that this field has been backported to the 6.x development branch. --- server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java index 444b232f88c..e7d02cb1a09 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java @@ -61,7 +61,7 @@ public class OsInfo implements Writeable, ToXContentFragment { this.availableProcessors = in.readInt(); this.allocatedProcessors = in.readInt(); this.name = in.readOptionalString(); - if (in.getVersion().onOrAfter(Version.V_7_0_0)) { + if (in.getVersion().onOrAfter(Version.V_6_6_0)) { this.prettyName = in.readOptionalString(); } else { this.prettyName = null; @@ -76,7 +76,7 @@ public class OsInfo implements Writeable, ToXContentFragment { out.writeInt(availableProcessors); out.writeInt(allocatedProcessors); out.writeOptionalString(name); - if (out.getVersion().onOrAfter(Version.V_7_0_0)) { + if (out.getVersion().onOrAfter(Version.V_6_6_0)) { out.writeOptionalString(prettyName); } out.writeOptionalString(arch);