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

Backport of Fix code block examples on dns-static-lookups.mdx into release/1.15.x #18893

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Backport of Fix code block examples on dns-static-lookups.mdx into release/1.15.x #18893

merged 1 commit into from
Sep 19, 2023

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #18880 to be assessed for backporting due to the inclusion of the label backport/1.15.

The below text is copied from the body of the original PR.

Description

HCL and JSON configuration examples were being displayed in the same code block. This commit separates the configurations to properly display them as independent configuration examples.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern
Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/fix-codeblock-dns-static-lookups/legally-glad-filly branch from a8e04bf to ec7d967 Compare September 19, 2023 15:40
@hc-github-team-consul-core hc-github-team-consul-core requested review from marianoasselborn and sarahethompson and removed request for a team September 19, 2023 15:40
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/fix-codeblock-dns-static-lookups/legally-glad-filly branch from 8ef2f2e to aa39d18 Compare September 19, 2023 15:40
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Sep 19, 2023
View reviewed changes
Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication theme/telemetry Anything related to telemetry or observability type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/agent-cache Agent Cache theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Sep 19, 2023
@hc-github-team-consul-core
Copy link
Contributor Author

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@vercel vercel bot temporarily deployed to Preview – consul September 19, 2023 15:50 Inactive
@blake blake force-pushed the backport/docs/fix-codeblock-dns-static-lookups/legally-glad-filly branch from aa39d18 to f7b101e Compare September 19, 2023 18:00
@blake
Fix code block examples on dns-static-lookups.mdx
eed6cc1 
HCL and JSON configuration examples were being displayed in the same
code block. This commit separates the configurations to properly
display them as independent configuration examples.
@blake blake force-pushed the backport/docs/fix-codeblock-dns-static-lookups/legally-glad-filly branch from f7b101e to eed6cc1 Compare September 19, 2023 18:30
@blake blake removed theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication theme/telemetry Anything related to telemetry or observability type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/agent-cache Agent Cache theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Sep 19, 2023
@hc-github-team-consul-core hc-github-team-consul-core merged commit 0dda40b into release/1.15.x Sep 19, 2023
100 checks passed
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/docs/fix-codeblock-dns-static-lookups/legally-glad-filly branch September 19, 2023 18:46
@jira jira bot mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@blake blake Awaiting requested review from blake

Assignees

@blake blake

Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @github-team-consul-core-pr-approver @blake