Bump version to 6.0.1 on the 6.0 branch#27386
Merged
DaveCTurner merged 7 commits intoelastic:6.0from Nov 15, 2017
Merged
Conversation
There will always be an unreleased version under the previous major version.
Member
Author
|
The build fails with this: It looks like it's (erroneously) trying to get 5.6.5-SNAPSHOT from maven rather than checking it out and building it locally. I do not (yet) know where the code to do this is. Hints appreciated. |
…ot but [-1] is not. I think this is the first time that's occurred, so this should not affect any earlier cases.
This commit adjusts the assertions for the sequence number BWC tests to account for the fact that sometimes these tests are run in mixed-clusters with 5.6 nodes (that do not understand sequence numbers), and sometimes these tests are run in mixed-cluster with 6.0+ nodes (that all understood sequence numbers). Relates elastic#27251
jasontedor
approved these changes
Nov 15, 2017
| /* This is a terrible hack for the bump to 6.0.1 which needs properly fixing at a later date */ | ||
| ext.projectSubstitutions["org.elasticsearch.distribution.deb:elasticsearch:${indexCompatVersions[-2]}"] = ':distribution:bwc-release-snapshot' | ||
| ext.projectSubstitutions["org.elasticsearch.distribution.rpm:elasticsearch:${indexCompatVersions[-2]}"] = ':distribution:bwc-release-snapshot' | ||
| ext.projectSubstitutions["org.elasticsearch.distribution.zip:elasticsearch:${indexCompatVersions[-2]}"] = ':distribution:bwc-release-snapshot' |
Member
There was a problem hiding this comment.
I discussed this with @DaveCTurner; this hack will be temporary until we can revisit the BWC logic which he will do in a separate issue. Given this, I'm fine with this hack going in temporarily so that we can execute this version bump.
This reverts commit 1aa406f. To be re-applied as a separate commit shortly.
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Nov 15, 2017
An attempt to bump to 6.0.1 on the 6.0 branch exposed up a handful of issues that this commit fixes. One of those fixes is a terrible hack that will be fixed more thoroughly in elastic#27397, and another is a back port of d5e56c5 which is related to elastic#27251.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Making this a PR rather than just a straight push because I've had to change the version calculation logic and would like reviews first.