Skip to content

Backport of Net 9069/fix local brokerage into release/1.2.x#3952

Merged
hc-github-team-consul-core merged 3 commits intorelease/1.2.xfrom
backport/NET-9069/fix-local-brokerage/noticeably-measured-cattle
Apr 25, 2024
Merged

Backport of Net 9069/fix local brokerage into release/1.2.x#3952
hc-github-team-consul-core merged 3 commits intorelease/1.2.xfrom
backport/NET-9069/fix-local-brokerage/noticeably-measured-cattle

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

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

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


Changes proposed in this PR

I tried several different approaches:

  • script to copy
    • pros: automated
    • cons:
      • need to clean up LICENSE file
      • make maintenance harder
  • Use parent dir as build-context
    • Can not load parent context
  • copy license file directly to control plane
    • LICENSE is rare to change
    • even when needed, it's very easy to copy and replace

The ending story is to just make another copy of LICENSE to control plane.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-9069/fix-local-brokerage/noticeably-measured-cattle branch from 601bd35 to 694a19f Compare April 25, 2024 05:51
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) April 25, 2024 05:51
@hc-github-team-consul-core hc-github-team-consul-core merged commit f5404fd into release/1.2.x Apr 25, 2024
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/NET-9069/fix-local-brokerage/noticeably-measured-cattle branch April 25, 2024 14:15
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.

2 participants