Skip to content

[7.6] [docs] Add username and password to haproxy example (#16703)#16801

Merged
ycombinator merged 2 commits intoelastic:7.6from
ycombinator:backport/7.6/pr-16703
Mar 5, 2020
Merged

[7.6] [docs] Add username and password to haproxy example (#16703)#16801
ycombinator merged 2 commits intoelastic:7.6from
ycombinator:backport/7.6/pr-16703

Conversation

@ycombinator
Copy link
Copy Markdown
Contributor

@ycombinator ycombinator commented Mar 4, 2020

Backports the following commits to 7.6:

@ycombinator ycombinator requested a review from a team as a code owner March 4, 2020 13:30
@ycombinator ycombinator requested a review from dedemorton March 4, 2020 13:30
@dedemorton
Copy link
Copy Markdown
Contributor

dedemorton commented Mar 4, 2020

@ycombinator The intake job failed. You probably just need to run make update or mage fmt update to pass.

@ycombinator
Copy link
Copy Markdown
Contributor Author

ycombinator commented Mar 4, 2020

Right, I expect it to fail because this PR needs to be followed by #16803. I wonder if we should close the latter one and incorporate its changes into this one? It means this PR wouldn't be a clean backport of #16703 but I think that's worth it. WDYT?

@ycombinator
Copy link
Copy Markdown
Contributor Author

ycombinator commented Mar 4, 2020

Ah, just saw your comment on the other PR: #16803 (comment). I'll close it out and incorporate its changes into this PR here.

@ycombinator ycombinator mentioned this pull request Mar 4, 2020
Closed
dedemorton
dedemorton approved these changes Mar 4, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

LGTM!

@ycombinator
Copy link
Copy Markdown
Contributor Author

ycombinator commented Mar 5, 2020

Jenkins CI failures are unrelated and Travis CI is green. Merging.

@ycombinator ycombinator merged commit d71063b into elastic:7.6 Mar 5, 2020
@ycombinator ycombinator deleted the backport/7.6/pr-16703 branch March 5, 2020 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@dedemorton dedemorton dedemorton approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ycombinator @dedemorton @andresrc