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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick to 7.x: Add missing SSL settings (#23632) #23668

Merged
merged 2 commits into from
Jan 26, 2021
Merged

Cherry-pick to 7.x: Add missing SSL settings (#23632) #23668

merged 2 commits into from
Jan 26, 2021

Conversation

dedemorton
Copy link
Contributor

Backports the following commits to 7.x:

@dedemorton
Add missing SSL settings (elastic#23632)
f2259d3 
# Conflicts:
#	libbeat/docs/shared-ssl-config.asciidoc
@dedemorton dedemorton requested review from a team as code owners January 25, 2021 19:46
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 25, 2021
@dedemorton dedemorton removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 25, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 25, 2021
@dedemorton dedemorton added the Team:Docs Label for the Observability docs team label Jan 25, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/obs-docs (Team:Docs)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 25, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 25, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #23668 updated

    • Start Time: 2021-01-26T20:44:21.127+0000

  • Duration: 49 min 55 sec

  • Commit: bc31efe

Test stats 🧪

Test Results
Failed 0
Passed 17304
Skipped 1373
Total 18677

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 17304
Skipped 1373
Total 18677

@dedemorton
Copy link
Contributor Author

Looks like someone forgot to run make update on the 7.x branch. Sigh. This should fix the build errors

@dedemorton dedemorton merged commit f44f5da into elastic:7.x Jan 26, 2021
@dedemorton dedemorton deleted the backport/7.x/pr-23632 branch January 26, 2021 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmorelli25 bmorelli25 bmorelli25 approved these changes

Assignees
No one assigned
Labels
backport Team:Docs Label for the Observability docs team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dedemorton @elasticmachine @bmorelli25