Fixing merge conflicts in amazon-ec2-utils/pull/33#36

Merged

vigh-m merged 4 commits intomainfrom

Mar 7, 2024

Commits on Jan 18, 2024

Add changelog entry for Guillaume's change to the ec2-metadata script (#30)
ziggythehamster
committed
Print ec2-metadata error to stderr. Closes #28.
ziggythehamster
committed

Commits on Mar 6, 2024

Merge remote-tracking branch 'origin' into pr/33
vigh-m
committed

Commits on Mar 7, 2024

Updating to force package updates
vigh-m
committed