Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update versions for start_trial after backport #30218

Merged
merged 3 commits into from
May 2, 2018
Merged

Update versions for start_trial after backport #30218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c71661f
Update versions for start_trial after backport
Tim-Brooks Apr 27, 2018
b5f603d
Merge remote-tracking branch 'upstream/master' into update_versions
Tim-Brooks Apr 30, 2018
d92f296
Merge remote-tracking branch 'upstream/master' into update_versions
Tim-Brooks May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public void readFrom(StreamInput in) throws IOException {

@Override
public void writeTo(StreamOutput out) throws IOException {
// TODO: Change to 6.3 after backport
Version version = Version.V_7_0_0_alpha1;
Version version = Version.V_6_3_0;
if (out.getVersion().onOrAfter(version)) {
super.writeTo(out);
out.writeString(type);
Expand Down
6 changes: 2 additions & 4 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public Status getStatus() {
@Override
public void readFrom(StreamInput in) throws IOException {
status = in.readEnum(Status.class);
// TODO: Change to 6.3 after backport
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
acknowledgeMessage = in.readOptionalString();
int size = in.readVInt();
Map<String, String[]> acknowledgeMessages = new HashMap<>(size);
Expand All @@ -98,8 +97,7 @@ public void readFrom(StreamInput in) throws IOException {

@Override
public void writeTo(StreamOutput out) throws IOException {
// TODO: Change to 6.3 after backport
Version version = Version.V_7_0_0_alpha1;
Version version = Version.V_6_3_0;
if (out.getVersion().onOrAfter(version)) {
out.writeEnum(status);
out.writeOptionalString(acknowledgeMessage);
Expand Down