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

docs: [7.x][apm] link to master in n.x branches #56539

Merged
merged 4 commits into from
May 11, 2020

Conversation

bmorelli25
Copy link
Member

Cherry-picks the following commits to 7.x:

@bmorelli25 bmorelli25 added the Team:Docs Meta label for docs team label May 11, 2020
@bmorelli25 bmorelli25 requested a review from a team May 11, 2020 19:05
@bmorelli25 bmorelli25 self-assigned this May 11, 2020
@jrodewig jrodewig added :Docs >docs General docs changes labels May 11, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-docs (>docs)

///////
APM does not build n.x documentation. Links from .x branches should point to master instead
///////
ifeval::[{source_branch} == 7.x]
Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm, this worked when I tested locally but doesn't seem to resolve correctly in the ci check.

docs/Versions.asciidoc Outdated Show resolved Hide resolved
@jrodewig jrodewig added :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) >non-issue labels May 11, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-security (:Security/Authentication)

@elasticmachine elasticmachine added the Team:Security Meta label for security team label May 11, 2020
Co-authored-by: James Rodewig <[email protected]>
Copy link
Contributor

@jrodewig jrodewig left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@bmorelli25 bmorelli25 merged commit 659edb9 into elastic:7.x May 11, 2020
@bmorelli25 bmorelli25 deleted the 7.x-add-apm-if-directive branch May 11, 2020 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>docs General docs changes >non-issue :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) Team:Docs Meta label for docs team Team:Security Meta label for security team v7.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants