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

Rename Amazon 7 to 2 #2532

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Rename Amazon 7 to 2 #2532

merged 1 commit into from
Jun 3, 2024

Conversation

joshcooper
Copy link
Contributor

Amazon 7 is an implementation detail, the actual OS is named Amazon 2

Blocked on puppetlabs/pxp-agent-vanagon#121

This will need to be backported to 7.x

Amazon 7 is an implementation detail, the actual OS is named Amazon 2
@joshcooper joshcooper marked this pull request as ready for review June 3, 2024 20:44
@joshcooper joshcooper requested a review from a team as a code owner June 3, 2024 20:44
@cthorn42 cthorn42 merged commit f4cebbe into puppetlabs:main Jun 3, 2024
3 checks passed
@joshcooper joshcooper deleted the amazon2 branch June 3, 2024 22:08
@joshcooper joshcooper added the backport 7.x Generate a backport PR to 7.x label Jun 3, 2024
Copy link

github-actions bot commented Jun 3, 2024

Backport failed for 7.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin 7.x
git worktree add -d .worktree/backport-2532-to-7.x origin/7.x
cd .worktree/backport-2532-to-7.x
git checkout -b backport-2532-to-7.x
ancref=$(git merge-base a16e281382ecd070ecddaaba9d1ed3060741d031 8c4b5b644510402e8441468fde3868f6c080a310)
git cherry-pick -x $ancref..8c4b5b644510402e8441468fde3868f6c080a310

@mhashizume
Copy link
Contributor

Manually backported this: #2534

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 7.x Generate a backport PR to 7.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants