Merge remote-tracking branch 'origin/upstreams/os-upgrade' into os-upgrade #106
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
February 28, 2025 04:49
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 24.4-0ubuntu1~24.04.2 Maintainer: Ubuntu Developers <[email protected]> Homepage: https://cloud-init.io/ Standards-Version: 4.5.0 Vcs-Browser: https://github.com/canonical/cloud-init/tree/ubuntu/devel Vcs-Git: https://github.com/canonical/cloud-init -b ubuntu/devel Build-Depends: debhelper-compat (= 13), dh-python, iproute2, po-debconf, python3, python3-configobj, python3-debconf, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-oauthlib, python3-pytest, python3-pytest-mock, python3-requests, python3-serial, python3-setuptools, python3-yaml, python3-responses, python3-passlib Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: 5d09930424fd7c3de83575f2f976134b329692a7 1871276 cloud-init_24.4.orig.tar.gz 80e07b540b592ff97d11794fcae9636bff018a38 95192 cloud-init_24.4-0ubuntu1~24.04.2.debian.tar.xz Checksums-Sha256: d46e39693d0db9bb574ed06d598be61eae62743fc490afc6397dfe39aa06f928 1871276 cloud-init_24.4.orig.tar.gz a1d0f79b5277896406ca24b674ef24079c1aa2cc4b2df8ad506d9d0fb97eb67c 95192 cloud-init_24.4-0ubuntu1~24.04.2.debian.tar.xz Files: 5c14fe88323e769ef486ee9a3b97677c 1871276 cloud-init_24.4.orig.tar.gz add2bdbfdb42bcc87243dc1248dcb838 95192 cloud-init_24.4-0ubuntu1~24.04.2.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEsyC5UhjFbFFc1+BoZ0j1UGIrpdQFAmdOEHwACgkQZ0j1UGIr pdR7qwv+Iqr/x6tuSOK/FMaTlPx2EqxoaviMLGadVPMyWc+JXbJmer2HF+2bivhw UxxaIUio+aDOHALnSBFt2FHj5K34EOFLYXyQyjcQQJdXDNcvo4hXUtsFmH3PD5iA sN04jp92kfX/5aOYBFsUIo+5lc1ioTz3rsxbwQ0Wx9l4HMqGY5qvm5BjKfow9vds lfGr+w59TQpYl6L08ZYUT6O0UhuP85KyiSJZcig7fEiTWtO+/QkxnF4pluztAySF pCGuJQnszGqs2GBv6AdF49UmsLAp/Dn1tHZ3ZXjEvUK0b9o1un7ZK00809d1znC/ rLc0e8relcKfjY0YwMaTSfKvn44Wn3BocqWHwjNwr09rq3Gh7+1+fNLBsGs+mNhV M+5e+l9AgrTO9Bwr0nIUUTyZl7d9t5tzYgwNTPRZoV+U6+dSCT8UUcCBL1XAWrzc vBcrKnjk2xpGASmyjjR67HADVQ4ilwRvRyr1/IzsnNvM0oNoZyz8trE2sbyZnVsy ueLlUL8Y =andW -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 24.4.1-0ubuntu0~24.04.1 Maintainer: Ubuntu Developers <[email protected]> Homepage: https://cloud-init.io/ Standards-Version: 4.5.0 Vcs-Browser: https://github.com/canonical/cloud-init/tree/ubuntu/devel Vcs-Git: https://github.com/canonical/cloud-init -b ubuntu/devel Build-Depends: debhelper-compat (= 13), dh-python, iproute2, po-debconf, python3, python3-configobj, python3-debconf, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-oauthlib, python3-pytest, python3-pytest-mock, python3-requests, python3-serial, python3-setuptools, python3-yaml, python3-responses, python3-passlib Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: a0aade6ef816a96a9698e9fa688585ea7d4612f2 1874945 cloud-init_24.4.1.orig.tar.gz a84fbe41f671c522d9a43e7786dfef105c6d2b80 99612 cloud-init_24.4.1-0ubuntu0~24.04.1.debian.tar.xz Checksums-Sha256: 8d03cef01654be39dd712dba29d673b05c18f9ff40499d5bb20d4ec9d4af37c7 1874945 cloud-init_24.4.1.orig.tar.gz 316496b17c7acc2c4c62de028cb19373f1c0715d3c7a223da6e79d1ebf47138b 99612 cloud-init_24.4.1-0ubuntu0~24.04.1.debian.tar.xz Files: 48d37e4bdaa75c103a029d1c24d689d1 1874945 cloud-init_24.4.1.orig.tar.gz 31db39f1dc44cc2bcec4ffa538d8e03c 99612 cloud-init_24.4.1-0ubuntu0~24.04.1.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEsyC5UhjFbFFc1+BoZ0j1UGIrpdQFAmejnDkACgkQZ0j1UGIr pdSPIwv/WwYbu2c45g/19Ge0c4EyclQRwTG/dqQK2AEKs+LPYKZtB8/Ma9wjYJOa eLPtWhH+ikrjSYgY6xUEIiha/ZteyatHvyGCPLo/ZWrNkREXHp+zYQgpTHmuHIpF 4YRton3pRul3P4mvOmy86TpkjfMYDqbnIiWoAFZzhpHiZ+eK/CNTJVM55tENHOMt Tovo+bZ/0LwAChv2GFlO0v3R0SkobzTyjIIvLxZ9yqLruWTA2SG7++EcaFs7pG7c BtWA9MU4hhNKjBRBpU2S4OSYTL6uPXB2iopTcxBY5mFnLEJJiaqLCwLkWKPGHdkx 9JEXHOY6TjzguaNnCSTMeD/NzibHb1Uh0CF+iTYgRbkEt+inLSAAL25Ia9oR5Kfl j97iup2XEJexBMueicKJ+CnVyHl9nyE+dF04dqLHUHc3v8yCT8Qn2euWflI03Lrz 3Czbg+N65waAxjxRZePDUZ9m5hMuLeBkyzIuVu0XJZaRMvNrSi4UHo592jsE/63s T00AHd+9 =DxfB -----END PGP SIGNATURE-----
sebroy
force-pushed
the
dlpx/pr/sebroy/1866988f-5bfa-4799-8183-4bff47132327
branch
2 times, most recently
from
b300f27 to
5ea3d78
Compare
sebroy
force-pushed
the
dlpx/pr/sebroy/1866988f-5bfa-4799-8183-4bff47132327
branch
from
5ea3d78 to
629adef
Compare
prakashsurya
approved these changes
Mar 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix merge conflict. There were four conflicts resolved:
.github/workflows/cla.yml: This had been deleted on our end. I restored the file and instead replaced theonsection withworkflow_dispatchto make the action manual-only..github/workflows/stale.yml: Same thing here.cloudinit/sources/DataSourceOracle.py: Kept our change and kept upstream changes from subsequent few lines.tests/unittests/sources/test_ec2.py: Re-removed the test that we had removed (that had been modified).