Skip to content

Commit 18f5e5a

Browse files
authored
Update RemoteConnectionInfo version constants (#52780)
Recent work was implemented to add proxy mode support for remote conneciton info. This work has been backported to 7.6. This commit updates the version constants on master to reflect this fact.
1 parent a789f74 commit 18f5e5a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ public RemoteConnectionInfo(String clusterAlias, ModeInfo modeInfo, TimeValue in
5151
}
5252

5353
public RemoteConnectionInfo(StreamInput input) throws IOException {
54-
// TODO: Change to 7.6 after backport
55-
if (input.getVersion().onOrAfter(Version.V_8_0_0)) {
54+
if (input.getVersion().onOrAfter(Version.V_7_6_0)) {
5655
RemoteConnectionStrategy.ConnectionStrategy mode = input.readEnum(RemoteConnectionStrategy.ConnectionStrategy.class);
5756
modeInfo = mode.getReader().read(input);
5857
initialConnectionTimeout = input.readTimeValue();
@@ -91,8 +90,7 @@ public boolean isSkipUnavailable() {
9190

9291
@Override
9392
public void writeTo(StreamOutput out) throws IOException {
94-
// TODO: Change to 7.6 after backport
95-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
93+
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
9694
out.writeEnum(modeInfo.modeType());
9795
modeInfo.writeTo(out);
9896
out.writeTimeValue(initialConnectionTimeout);

0 commit comments

Comments
 (0)