Skip to content

Merge upstream#7

Merged
spalger merged 2 commits intoelastic:masterfrom
watson:merge-upstream
Dec 2, 2020
Merged

Merge upstream#7
spalger merged 2 commits intoelastic:masterfrom
watson:merge-upstream

Conversation

@watson
Copy link
Copy Markdown

@watson watson commented Dec 2, 2020

I managed to fix the CI issues upstream. This PR pulls down those changes.

watson and others added 2 commits December 2, 2020 15:41
* Create ci-plugin.yml

* Remove .travis.yml

* test: ensure fallback function is bound to the correct object

* test: increase wait time before assertions

Co-authored-by: Jonas Pauthier <jonas.pauthier@gmail.com>
@watson watson requested review from mshustov and spalger December 2, 2020 14:59
@watson watson self-assigned this Dec 2, 2020
@watson watson mentioned this pull request Dec 2, 2020
Copy link
Copy Markdown

@spalger spalger left a comment

Choose a reason for hiding this comment

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

LGTM!

@spalger spalger merged commit 37ce6d7 into elastic:master Dec 2, 2020
@watson watson deleted the merge-upstream branch December 2, 2020 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants