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.

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

Add version constant for 5.5 #24075

Merged
merged 1 commit into from
Apr 12, 2017

Conversation

nik9000
Copy link
Member

@nik9000 nik9000 commented Apr 12, 2017

This is required in master now that #24071 is in or else we fail during BWC testing because the 5.x branch contains 5.5 but the build thinks it should contain 5.4.

@nik9000
Copy link
Member Author

nik9000 commented Apr 12, 2017

I'm still running tests on this locally but the build for master is totally busted without this.

Copy link

@abeyad abeyad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@nik9000 nik9000 merged commit 31c8903 into elastic:master Apr 12, 2017
@nik9000
Copy link
Member Author

nik9000 commented Apr 12, 2017

Thanks for reviewing @abeyad and @jasontedor!

@bleskes
Copy link
Contributor

bleskes commented Apr 12, 2017 via email

@nik9000
Copy link
Member Author

nik9000 commented Apr 13, 2017 via email

@abeyad
Copy link

abeyad commented Apr 13, 2017

I updated the guide with the steps needed for the master branch

jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Apr 13, 2017
* master:
  Remove more hidden file leniency from plugins
  Register error listener in evil logger tests
  Detect using logging before configuration
  [DOCS] Added note about Elastic Cloud to improve 'elastic aws' SERP results.
  Add version constant for 5.5 (elastic#24075)
  Add unit tests for NestedAggregator (elastic#24054)
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Apr 13, 2017
* master: (41 commits)
  Remove awaits fix from evil JNA native tests
  Correct handling of default and array settings
  Build: Switch jna dependency to an elastic version (elastic#24081)
  fix CategoryContextMappingTests compilation bugs
  testConcurrentGetAndSetOnPrimary - fix a race condition between indexing and updating value map
  Allow different data types for category in Context suggester (elastic#23491)
  Restrict build info loading to ES jar, not any jar (elastic#24049)
  Remove more hidden file leniency from plugins
  Register error listener in evil logger tests
  Detect using logging before configuration
  [DOCS] Added note about Elastic Cloud to improve 'elastic aws' SERP results.
  Add version constant for 5.5 (elastic#24075)
  Add unit tests for NestedAggregator (elastic#24054)
  Add more debugging information to rethrottles
  Tests: Use random analyzer only on string fields in Match/MultiMatchBuilderTests
  Cleanup outdated comments for fixing up pom dependencies (elastic#24056)
  S3 Repository: Eagerly load static settings (elastic#23910)
  Reject duplicate settings on the command line
  Wildcard cluster names for cross cluster search (elastic#23985)
  Update scripts/security docs for sandboxed world (elastic#23977)
  ...
@bleskes
Copy link
Contributor

bleskes commented Apr 13, 2017 via email

@nik9000 nik9000 deleted the add_version_for_new_branch branch June 7, 2017 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants