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

Merge remote-tracking branch 'origin/upstreams/develop' into upstream-merge #94

Conversation

prakashsurya
Copy link
Contributor

@prakashsurya prakashsurya commented Oct 31, 2024

Minor conflict in cloudinit/net/__init__.py, took our changes. Also conflict in .github/workflows/cla.yml and took our changes again (deleted file).

Delphix Engineering and others added 2 commits September 29, 2024 04:16
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 3.0 (quilt)
Source: cloud-init
Binary: cloud-init
Architecture: all
Version: 24.3.1-0ubuntu0~20.04.1
Maintainer: Ubuntu Developers <[email protected]>
Homepage: https://cloud-init.io/
Standards-Version: 4.4.1
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 (>= 9.20160709), 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:
 ccd9856f874343d73c1c1b838ead0f72d1d34f7f 1824845 cloud-init_24.3.1.orig.tar.gz
 e16aed81a94feff8dd97197a41ec404e9c299e49 100912 cloud-init_24.3.1-0ubuntu0~20.04.1.debian.tar.xz
Checksums-Sha256:
 8e4946ea607440225a7a3b4651a370adef701de10494f881ab9d6bab98e3ec10 1824845 cloud-init_24.3.1.orig.tar.gz
 0204dfb57772ff558e98a4fb0ff5c70a1d857c122f1a266ab3abd7eed8e9154d 100912 cloud-init_24.3.1-0ubuntu0~20.04.1.debian.tar.xz
Files:
 86e54ae237dbf8a930efcc9a202b60ba 1824845 cloud-init_24.3.1.orig.tar.gz
 cbd4e61c4a694d17fb14ba558be6e44f 100912 cloud-init_24.3.1-0ubuntu0~20.04.1.debian.tar.xz
Python-Version: all

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAmbgb5QACgkQ7NrLFgmV
rYkEEQ//VCVq14fdTr2b89ThJeMi3bNnGHJcPnVyntRKoF/UstFMcWip79yFoCAz
ngRhmuZJuBQigetc1NK9X7AAtkFL6ywDmd9njcK5hKx2smcdF3RGRDMSO8XJPUzc
kzNhtWNqsssW7RRi51jGf4mjYsTdQutn6mvdxU2vqYRmPdudjy7xpWC8xGfnl/js
6DSf5Iuh8U74sew2SteD2MzNQxge1C2AeyNilW350UNDhP6KKwzLz6vRyKMg2p8M
HrKNyQDUi/mnUFNGAje3aDlDy3GT4ryuzT02bq28J4oABIETPqQLVcOu38fYGuXh
T6OBPK1979o2Ttttmk9X3KW0Nn4gsbso2u/98KAnsfT1qkVoX5jN05bLvJzz58yl
wiZr1pE5mojtKuB3dxUIjm2cENGaaU7uEpusKUXNc5g3Tok6iX59p6kRNMR+67iz
IHPyD/jKDiS+u+wTYuCCZWlYO07d4jJOJ1ttEGMEa7fTJGeL4gmj5dJNo1g7YGM6
Lg/x5eDbNdXbJvUNLWn59NoW88rZ8aKIiCqkwcsGRJvHmdVOc+6jC/QYFAasplVW
BN4rAWLWAPGbchBfZieSK1fKQXUFoaj5amrU8xgGQ44ktxh1EUBbqeRZMyW6jMxe
KHx+aleUDRFdGWiCZv26gFfHHXK3K80VeO0M9M4b9tWHR5qkUpE=
=E3Bw
-----END PGP SIGNATURE-----
@prakashsurya prakashsurya force-pushed the dlpx/pr/prakashsurya/813c1be9-7728-417d-b08e-0ccf7ff2b9c8 branch from dc36de9 to 5276d0a Compare October 31, 2024 15:35
@prakashsurya prakashsurya marked this pull request as ready for review October 31, 2024 15:38
@prakashsurya
Copy link
Contributor Author

Closing in favor of #93

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

1 participant