Merged
Conversation
Member
Author
|
I'm still running tests on this locally but the build for master is totally busted without this. |
Member
Author
|
Thanks for reviewing @abeyad and @jasontedor! |
Contributor
|
Thx Nik! Should we add something to our version bumping doc?
… On 12 Apr 2017, at 10:30 PM, Nik Everett ***@***.***> wrote:
Thanks for reviewing @abeyad and @jasontedor!
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Member
Author
|
Probably! I'm out the next two days. Can you do it?
…On Wed, Apr 12, 2017, 6:02 PM Boaz Leskes ***@***.***> wrote:
Thx Nik! Should we add something to our version bumping doc?
> On 12 Apr 2017, at 10:30 PM, Nik Everett ***@***.***>
wrote:
>
> Thanks for reviewing @abeyad and @jasontedor!
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub, or mute the thread.
>
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#24075 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AANLooWSG5hZRf2KBQWR1n6sPE9ksFMLks5rvUnrgaJpZM4M76lw>
.
|
|
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) ...
Contributor
|
Thank you Ali!
… On 13 Apr 2017, at 04:53, Ali Beyad ***@***.***> wrote:
I updated the guide with the steps needed for the master branch
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub, or mute the thread.
|
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
4 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.
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.