Skip to content

Backport of all: swap exp packages for maps, slices into release/1.4.x#18313

Merged
shoenig merged 1 commit intorelease/1.4.xfrom
backport/go-slices-maps/mistakenly-novel-mole
Aug 24, 2023
Merged

Backport of all: swap exp packages for maps, slices into release/1.4.x#18313
shoenig merged 1 commit intorelease/1.4.xfrom
backport/go-slices-maps/mistakenly-novel-mole

Conversation

@hc-github-team-nomad-core
Copy link
Copy Markdown
Contributor

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@shoenig
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/nomad/merges: 409 Merge conflict []

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


Original PR had no description content.


Overview of commits

@hc-github-team-nomad-core hc-github-team-nomad-core force-pushed the backport/go-slices-maps/mistakenly-novel-mole branch 2 times, most recently from fcea97c to 7ab2abb Compare August 23, 2023 20:42
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Aug 23, 2023

CLA assistant check
All committers have signed the CLA.

@shoenig shoenig marked this pull request as ready for review August 24, 2023 00:39
@shoenig shoenig merged commit e34a326 into release/1.4.x Aug 24, 2023
@shoenig shoenig deleted the backport/go-slices-maps/mistakenly-novel-mole branch August 24, 2023 00:39
@github-actions
Copy link
Copy Markdown

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants