Code

docs: Fix merge conflicts#17405

Code

Merged

boruszak merged 6 commits intorelease/1.15.xhashicorp/consul:release/1.15.xfrom backport/docs/annotations-page-structure-fixes/vastly-pretty-foxhashicorp/consul:backport/docs/annotations-page-structure-fixes/vastly-pretty-foxCopy head branch name to clipboardMay 18, 2023

-14

Commits

Commits on May 12, 2023

• no-op commit due to failed cherry-picking

  

  temp

  committed
  c93e830

  Copy full SHA for c93e830

Commits on May 17, 2023

• docs: connect-service-upstreams annotation fixes (#17312)

  Show description for 441f698
  

  3 peoplecommitted
  441f698

  Copy full SHA for 441f698

• Merge branch 'release/1.15.x' into backport/docs/annotations-page-structure-fixes/vastly-pretty-fox

  boruszak

  authored
  8f0a1e3

  Copy full SHA for 8f0a1e3

• Merge branch 'release/1.15.x' into backport/docs/annotations-page-structure-fixes/vastly-pretty-fox

  boruszak

  authored
  a2f63bb

  Copy full SHA for a2f63bb

Commits on May 18, 2023

• Fix merge conflict

  boruszak

  committed
  6cad4d4

  Copy full SHA for 6cad4d4

• Merge branch 'release/1.15.x' into backport/docs/annotations-page-structure-fixes/vastly-pretty-fox

  boruszak

  authored
  49f176d

  Copy full SHA for 49f176d