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

Backport apm settings fixes 6.6 #33343

Merged
merged 5 commits into from
Mar 15, 2019

Conversation

bmorelli25
Copy link
Member

@bmorelli25 bmorelli25 commented Mar 15, 2019

Backports the following commits to 6.6:

bmorelli25 and others added 5 commits March 15, 2019 12:32
# Conflicts:
#	docs/settings/apm-settings.asciidoc
GitHub's asciidoc parser handles `*` characters fine but markdown thinks its italicizing unless you escape the first asterisk. Subsequent asterisks on the same line can stay unescaped and should work fine.

# Conflicts:
#	docs/settings/apm-settings.asciidoc
@bmorelli25 bmorelli25 self-assigned this Mar 15, 2019
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@bmorelli25 bmorelli25 merged commit 67e2180 into elastic:6.6 Mar 15, 2019
@bmorelli25 bmorelli25 deleted the backport-apm-settings-fixes-6.6 branch March 15, 2019 23:00
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.

4 participants