DLPX-94537 fix cloud-init merge conflict#113
Merged
Conversation
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 25.1.2-0ubuntu0~24.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> 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: 8d6f6baac2e06f4a9a5334853035987d40b4a437 1895144 cloud-init_25.1.2.orig.tar.gz b501896bba495ec7d901d54212b76b862809e837 96048 cloud-init_25.1.2-0ubuntu0~24.04.1.debian.tar.xz Checksums-Sha256: 0dd6f8adc3187b07d8e38fdef93c3e71051c1019d8777fb280375ae8da5f9cbb 1895144 cloud-init_25.1.2.orig.tar.gz 9e0a072d8484422378d54f4e225372a62f2e884b7256b251a757d842c7334e44 96048 cloud-init_25.1.2-0ubuntu0~24.04.1.debian.tar.xz Files: c09bd1faa0a8f549fb698078fb701ff0 1895144 cloud-init_25.1.2.orig.tar.gz 03d5dd2bde81402b452d651544caffb1 96048 cloud-init_25.1.2-0ubuntu0~24.04.1.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEsyC5UhjFbFFc1+BoZ0j1UGIrpdQFAmgr43kACgkQZ0j1UGIr pdQLpAwAstlEhHnUH6yaV0tLoSB4f6hGgKyQEDnK332LexlJ8PssXjV8dtKnLevi K94VtmGAr/5b6lgX02PztS4qWJBPxQIvIcme/f9Qe6eSqtSSLzxy0L7sDvzUVTI4 0hdNIxKCvHm3X5cyty4T1i4leplMnfXbaGk4OeKQKHXjvACAPZ+zjeFLd3DZN6wv T58VNa9WdIGWxopn4YBtIPMlZ5MAx/emsmCOq3M7q1UdI2UtcgEbj/1SzGWouHna DFfLoYhA/ajutihCNLfnUacSlvZGUE3xvZmxmbn6aKU5pJFqKD9aessA9Ysn2dcZ KVBcxwT+Idx5/Jr1A0+Xp8kpzgmfF3OyV6UrtGkxJQKsPmbGmJR9efPpK40fLh7B 6zaseINocWUHu2wy6uaauRQitVMUIoSVRRo0eim0TF3YcNDNDbFEMo3zftqPStWN 8OPxrH1x9HSRQQQdvtwUCTIeECyMHUltnumavlg3HWtZ0f+TbeIng8bG2zGy3DLz 53okaXLq =fiOL -----END PGP SIGNATURE-----
sebroy
force-pushed
the
dlpx/pr/sebroy/f4d3d45f-d61b-4f3e-896a-522b7af3e9fa
branch
from
cb78278 to
aa1f139
Compare
prakashsurya
approved these changes
Jun 24, 2025
manoj-joseph
approved these changes
Jun 25, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 a merge conflict in
cloudinit/util.py. Upstream changed the definition ofHostnameFqdnInfoto be a class. That code was adjacent to code we added to validate the fqdn, resulting in a conflict.ab-pre-push: https://selfservice-jenkins.eng-tools-prd.aws.delphixcloud.com/job/appliance-build-orchestrator-pre-push/11467/