Merge remote-tracking branch 'origin/master'#27
Closed
prakashsurya wants to merge 20 commits into
Closed
Conversation
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 19.2-36-g059d049c-0ubuntu1~18.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Standards-Version: 3.9.8 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, pep8, po-debconf, pyflakes, python3, python3-configobj, python3-httpretty, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-nose, python3-oauthlib, python3-pep8, python3-pyflakes | pyflakes (<< 1.1.0-2), python3-requests, python3-serial, python3-setuptools, python3-six, python3-unittest2, python3-yaml Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: c0f0d66756bd64b5b3f44640e5c50803004f40f6 1054192 cloud-init_19.2-36-g059d049c.orig.tar.gz d0e7771a5938a707581dcdd454eb3e00d4ca2f24 63428 cloud-init_19.2-36-g059d049c-0ubuntu1~18.04.1.debian.tar.xz Checksums-Sha256: 933eb7c68355cd0f763d39345892ebcefd6965f188fb22388fcd5d84b5b2eeab 1054192 cloud-init_19.2-36-g059d049c.orig.tar.gz 166b70b1bd2644f7f677db74be5991fead7d3fb8e54a12c4e383ad469e697a15 63428 cloud-init_19.2-36-g059d049c-0ubuntu1~18.04.1.debian.tar.xz Files: f89fd16d67c0a15acdce711cd728a021 1054192 cloud-init_19.2-36-g059d049c.orig.tar.gz b5efd1d4ca122f1bdd3f7a015de256a6 63428 cloud-init_19.2-36-g059d049c-0ubuntu1~18.04.1.debian.tar.xz Python-Version: all -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAl2A+f0ZHGNoYWQuc21p dGhAY2Fub25pY2FsLmNvbQAKCRDs2ssWCZWtiax5D/96b6+JqecvJZ6TjG8nWbsE JD85ePcaOf0b/0B44XQavJ+SSE2cEUh9JddtHI9O1tQIHAksGVaGo69cU8h7IrnE rONq5WhRxhbh2mqk3MYLpWhsQKbJE4RurhPZoAkuszmzh+MqxZYtQSBiY1Tchp/k n74+08VXPfVU7oDLzQCF2SgXzvcmDH/sCQnEGkIvHzv/qn457+nlRq2ua/KCx5eP QPNDBLpiCrAFs0U+IosBFjlGr3O2q1Ae+3IMZBT+nrbk0EZOYnNmcJ3rMJFCK1mT 5NNq3b6tVXSS3fG80NiQwku8zWFvTEDezNND89mkXrMWc9UE/61JCYhhu5EfY77e t0crn6UDHJtwyAV7NNdylROpAqMxgl+AiFn++lztwDpPMhxHYkc6PFQZO5bskawV qOzLqqn9+cu/EkUgwsF813lfIonzZN1+E4es0KK1GqkLY142TwRbcjloOIifoJS+ 9V0ixsjha3EhuFZ5JnD+E+H2HoNoenxViSvpB0uJivayk9cvUM0orFJQVDHjT0jt mC9MBqapXYqCms9tKbtBe6WwV0iv0V5CmXm9Zv0apMyEoOpX4F6ZoLufcIJd4HhS Uk8pLMIwM064YlkX1Qt99B1E30tV3+2vuk4nm79j4+f1qt4OEIUMCsvz/puUUd+f F/cRvfJzP1nzNb4FAUNL/w== =lTPX -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 19.2-36-g059d049c-0ubuntu2~18.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Standards-Version: 3.9.8 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, pep8, po-debconf, pyflakes, python3, python3-configobj, python3-httpretty, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-nose, python3-oauthlib, python3-pep8, python3-pyflakes | pyflakes (<< 1.1.0-2), python3-requests, python3-serial, python3-setuptools, python3-six, python3-unittest2, python3-yaml Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: c0f0d66756bd64b5b3f44640e5c50803004f40f6 1054192 cloud-init_19.2-36-g059d049c.orig.tar.gz 2df74e53178c50020d01cbace1cca99d8b54f7da 64804 cloud-init_19.2-36-g059d049c-0ubuntu2~18.04.1.debian.tar.xz Checksums-Sha256: 933eb7c68355cd0f763d39345892ebcefd6965f188fb22388fcd5d84b5b2eeab 1054192 cloud-init_19.2-36-g059d049c.orig.tar.gz eb9fb7f7c8605f03fcf224b098a2ab05e280a4e98b673db5363eae7c8be7da41 64804 cloud-init_19.2-36-g059d049c-0ubuntu2~18.04.1.debian.tar.xz Files: f89fd16d67c0a15acdce711cd728a021 1054192 cloud-init_19.2-36-g059d049c.orig.tar.gz 784b1255a2d53d20603419b3c5dd1b9d 64804 cloud-init_19.2-36-g059d049c-0ubuntu2~18.04.1.debian.tar.xz Python-Version: all -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEESt1HRBpmI+cpG/K57uaHdu2xPqAFAl2XawwACgkQ7uaHdu2x PqBaaw//RwFj/IM1TyoQ1w53qClMTZZ9q4Rbl3c8HdkSY5olD/NZ7sa/rUA5Mrek c5WH0dZXvS78vsA6oa+veuDrTGrJaKjWXf55pJmHcZm+XpugoUp9RGh+DTjYGI44 s/7r2GQDk5Tg0N0bdDKdEIWv8tf2AfbipKdPFgB5ZBQ+ZSQRgbVnMVVuUIQRLaL5 P//nEcoz1Z3Vi4OvnkRltUHy31OoyLDAJt5irqEKl5FIvaJgyGCHtR+tSOOCaML8 LQHH4q1Ho/GTshMSHMh0U5cL3jRJLx0ILmPveYwMeGadVaKy45k2LqxtmZ607dGM KS6ioOgCPar16zdr/OTcjg+JJgWMRhl2N8/zPOA82LCg3MTIWuVF+49ihfu15SRF Yq19rwtIFBZR3xIbFMTjV2bW+hzGpoKsP/y58GxEfIp6DQ2d0awUbh/h7qXwk2kl xItgSk+IRG2jldaIG9U5/ZHjML0VeZmKDd/Qh8DBJ+e95db9zwd9HNHFjqDwTVpJ RP4kq2Gz07OaxaYdwoD4Ky+kc/qsvZJnEMkdLAEu3DuMVTWieLEnx5F5ZrN+s9A/ php6eXNrhV+4mMvofM44Ujm5EDM9aXVEewmFJ6T6EQ1Viq/P7+cBaFHnVIRfeHin upxMZi29V6iWuNclJx8rhWc17pn3+syps3EfiWVZYH/AtV4CPhs= =R6wC -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 19.3-41-gc4735dd3-0ubuntu1~18.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Standards-Version: 3.9.8 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, pep8, po-debconf, pyflakes, python3, python3-configobj, python3-httpretty, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-nose, python3-oauthlib, python3-pep8, python3-pyflakes | pyflakes (<< 1.1.0-2), python3-requests, python3-serial, python3-setuptools, python3-six, python3-unittest2, python3-yaml Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: fa2d976998ab396582b4f2c9d5b87b6859985e0e 1083676 cloud-init_19.3-41-gc4735dd3.orig.tar.gz 116b3483c92414691de73a64aaf6ac503941f4eb 64896 cloud-init_19.3-41-gc4735dd3-0ubuntu1~18.04.1.debian.tar.xz Checksums-Sha256: 48cb7396b69f0306a23bd7d9e3302c72777566b7458ce087e3aa480ce092c6be 1083676 cloud-init_19.3-41-gc4735dd3.orig.tar.gz f9e9b9e9a02079e6e6fc90bc3f559c6be231191f22d75099ed0828fb30f4f10f 64896 cloud-init_19.3-41-gc4735dd3-0ubuntu1~18.04.1.debian.tar.xz Files: ca3cfdba81d0bbe52fcb853ae36160b9 1083676 cloud-init_19.3-41-gc4735dd3.orig.tar.gz 2eac60d8e9355f118b2bd3029ebfe1e6 64896 cloud-init_19.3-41-gc4735dd3-0ubuntu1~18.04.1.debian.tar.xz Python-Version: all -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAl3m6fQZHGNoYWQuc21p dGhAY2Fub25pY2FsLmNvbQAKCRDs2ssWCZWtiSJkD/oCj+RKDAKTsxG5jk+2+dAC +Yt2HZ6rFf11MrDVIbbTNjn1yC5K8tvUKIAUj7wUs52DyEhV0QudOBVTWMJo7iQ4 z8j1eKBif10JcC6QrL2ZzFGdk7wi1mdJAoGliFAZdQaUYVZQwAJ68tMoDXOaI+tV jg841d95DVdNM7kwRdi1zy8YyiWFvbpLtDtL2XBEgPyAq2u0YLjhFtZsywyki7X/ 6rfW9StxMmhoXcqAJEwlMhfaPPJZzmdELP5NkbbbBU6BKjVemX3G3zrlosZz6sGZ IK/U/f3rEwNOyeMZs6uVnd4TzLDKf2qaqZ6Sl0AXIaiN4PHms49RRrCC0ZLHlFMA +LdjioX2qtMKnHB7xzutXS5GBBUngN/9od8oH1GYBAuzBvdwi5PbcBLTIigqQrGq aoJ3YIxHW86EVUGbRYUtbI97lYW258mFuu3RB8Sek0FCIqYT4NKNZNF4t33V1tOV 4dUYFgQAAUEUlC3j+NeVOeLTkvrmt5oggYzprPNkp/8vGYeKbFa0YNccKZVZGfUu mmWjMG+v4r+sFSUl3luaLpjBp/GIav1fNaCGVC0yZxbE4yKuBSMSv8iphCmX9S4W 2KuhjafDmFAs5tsLDyQbvchKWHll8oGxOCRwdbmbN7+sTClSe6UnnucfURBsPCRp 0zKetAOnrLL3UPIN4flHAA== =Ycc+ -----END PGP SIGNATURE-----
This reverts commit a0038a6. A conflicting implementation of the same feature has been pushed upstream: https://code.launchpad.net/~pzakha/cloud-init/+git/cloud-init/+merge/367721.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 19.4-33-gbb4131a2-0ubuntu1~18.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Standards-Version: 3.9.8 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, pep8, po-debconf, pyflakes, python3, python3-configobj, python3-httpretty, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-nose, python3-oauthlib, python3-pep8, python3-pyflakes | pyflakes (<< 1.1.0-2), python3-requests, python3-serial, python3-setuptools, python3-six, python3-unittest2, python3-yaml Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: 95f006fe189161879ff52c829bd25afbab6a89cc 1083654 cloud-init_19.4-33-gbb4131a2.orig.tar.gz 2a87d26a07d586a4f3a6abc00810e72d5ab044b1 65892 cloud-init_19.4-33-gbb4131a2-0ubuntu1~18.04.1.debian.tar.xz Checksums-Sha256: 1340ffcdc51a961d211c86774449e81d5814c00faac81e8448dfdf39d754995c 1083654 cloud-init_19.4-33-gbb4131a2.orig.tar.gz b759aa6672336a6e4748bb92932373e17cbf373ed97eb87670349600095f02c3 65892 cloud-init_19.4-33-gbb4131a2-0ubuntu1~18.04.1.debian.tar.xz Files: 19d52a198f032e02de9246aaa092df20 1083654 cloud-init_19.4-33-gbb4131a2.orig.tar.gz 05b777b25c7712866c6cd1b3a9eb4b15 65892 cloud-init_19.4-33-gbb4131a2-0ubuntu1~18.04.1.debian.tar.xz Python-Version: all -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAl4fXxAZHGNoYWQuc21p dGhAY2Fub25pY2FsLmNvbQAKCRDs2ssWCZWtiYoIEACU70rHaDY+NG2UdvkdIecS U0HtokUXuf2og+mfrZMeETGA2tUKUAGO49SPxT+GEHmFFf/e2JgRq+oSeHHYlgkT i1RBEFTE8Xr1gJtC/+y1d81UJXEqrEoSq8baXbzs7fNDgGgGh1ScD5GAi7qzRfeQ VbThVgpbLOVImPHOUIDDB02mjufWsJocjk3BYlXSM+S3PjRik/x+Ah8GVe9ov5jS vbS6P9WF3aMztECuwb/jiTYSy4DYYw9G2ibfrPsZCQSuFySSShtTk2sSIbG0I3f6 rcSj/JXAkV027JT+C0nd9fqWf7nFf5rf3KpZ9mwQHz6xQ/7jRjvH04nS8xA+92Mn ZrCkyx4K8gQZkOLnTF0nWwu16fezlNHACOYKmNLuweNsbNcq9mmqqI7c73mW+58m CqHOZKLWtgbsoS2w3Py30Am8Ty0b11SIOHpelZ9sCFNN1azyU25UnlgEk1PMkvYF tYDtUV8MLmzuQHblaghzK5en0zKAyoDIBYng1g4bVGB1Uv8WmHi3SHHayFQapbAt dw1ErCnf1gpwi42biJo1WpXXBQrIjzx2kpAq5aUqIvTsYCw6GoD+PLTrtts9rKIS Tpns5Zi3HnWAGMngCdBzIGtJ3Y24imqZDJl9z18Q4pJcd2R22dUdyXphl0Q61a+z mtZXx4vn4M0sIHMOQvR5BA== =ooft -----END PGP SIGNATURE-----
This reverts commit 90e1170.
…ent them from running within upgrade container (#15) This is a continuation of 144e73f. As described in 144e73f, we don't want the cloud-init related services to run within an upgrade container. Unfortunately, that prior commit does not ensure the services don't run, when there's another service that depend on a cloud-init service. In our case, when running on GCP, the "google-startup-scripts" services has a depdency on "cloud-final", $ systemctl cat google-startup-scripts | grep Wants Wants=cloud-final.service causing the cloud-init service to run even though it should have otherwise been disabled (due to the changes in 144e73f). This change adds configuration to all of the cloud-init services such that they won't run in the upgrade container; even if they're inadvertently started due to a dependency, as was our case on GCP.
In commit 61f2f79 we added the field "ConditionalVirtualization" to a couple of the systemd services, rather than "ConditionVirtualization". As a result, we can see messages like the following via dmesg: [ 7.593710] systemd[1]: /lib/systemd/system/cloud-final.service:7: Unknown lvalue 'ConditionalVirtualization' in section 'Unit' [ 7.604843] systemd[1]: /lib/systemd/system/cloud-config.service:6: Unknown lvalue 'ConditionalVirtualization' in section 'Unit' This commit fixes the situation, replacing "ConditionalVirtualization" with "ConditionVirtualization".
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 20.2-45-g5f7825e2-0ubuntu1~18.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Standards-Version: 3.9.8 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, pep8, po-debconf, python3, python3-configobj, python3-httpretty, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-oauthlib, python3-pytest, python3-requests, python3-serial, python3-setuptools, python3-yaml Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: ac75606f65aa38808cf561719d3938b5e931117a 1126750 cloud-init_20.2-45-g5f7825e2.orig.tar.gz 47d14948d668444aa4dc2e3701168332e52ac245 70576 cloud-init_20.2-45-g5f7825e2-0ubuntu1~18.04.1.debian.tar.xz Checksums-Sha256: 90125b1e0585f238172c50fdd6d894892d55111746f779be7b521bea2c1336b5 1126750 cloud-init_20.2-45-g5f7825e2.orig.tar.gz 7db476818698a8e0561b7c40be5fb3fddfc9886315129003e5e0e8671d8d3821 70576 cloud-init_20.2-45-g5f7825e2-0ubuntu1~18.04.1.debian.tar.xz Files: 8d723c39e420636d839a4739576ee4c4 1126750 cloud-init_20.2-45-g5f7825e2.orig.tar.gz a0d5558b83776bb3df03b75fd3ae62ed 70576 cloud-init_20.2-45-g5f7825e2-0ubuntu1~18.04.1.debian.tar.xz Python-Version: all -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAl7YGykZHGNoYWQuc21p dGhAY2Fub25pY2FsLmNvbQAKCRDs2ssWCZWtiZM3EADIybFksfLy47j6HYha8kMB BaW/H8Vj0dtNcyt89HIdBellg+tt5oIvd/YC36NoUoZ+F6BzMxu5hcowCckL5ce7 5d27RyYKFoxjomkQ/9jS5VI/GJm2hCAGgw9F8DyF3aUvKzbogdxUPhE8ssjEYCSh lEgBaOIP5UUH5h2glIxvfqsvvDYssHKjfiHrMnnhNFvQn/ucDX5ixOgRSgfSOkTP TCHddCFUGNxizHVrtkpMeGyUEeX6L63dAfKd+a3ysfK0Cxvh/4vytvsyIda7RvNS dUN1XjGx3KG2j/aE882Dn3KZRsZwgVTx3rwxk9gWFRLkMzuNxdRxi2F6K7L3hqmI PNBYd2xj3LY/FV4VCFdfsxQjFyaA3QMFRa990KcEK/1KYh6epwVIMMTo5ZtXyed5 bIrrb4oY2hXYG0fIHN15qYAL8LtF3dJwp2FUjJdUcgWmw4gEB2X2Y06ZcoQKggDs LjRXWszeMqO8D/0WY/MbPMjWT9NX8oba3RDysFistE+gPhFfjU4qQ1V4mWCl+85K tXKSeY3/NaapHME8ZWhOX9Sp9/HIv9r/VOld92Ucla+D5ZhRcI2j491N57W94O6J QtoYXM7RaEHisevIEY8xG8E7lGWrm8g2ug2TLL8DtWy2Ixl9nDmDNsOKGAk8vDx8 QDUgAS34zcFgOoJU6J/zCw== =6fgs -----END PGP SIGNATURE-----
To make the network configuration more resilient to changes of the MAC address, this change modifies the netplan configuration generated by cloud-init to no longer match on the MAC address. This way, if the MAC address of a NIC changes (which can happen in VM environments), the network configuration on the system should still work as before.
The prior commit 271b349 appears to only work on ESX based DE due to the fact that we don't use any cloud datasource when running on that platform. This change attempts to extend that same change, but to work properly on the Azure, Ec2, and Oracle cloud platforms.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: cloud-init Binary: cloud-init Architecture: all Version: 20.3-2-g371b392c-0ubuntu1~18.04.1 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Standards-Version: 3.9.8 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Build-Depends: debhelper (>= 9.20160709), dh-python, iproute2, pep8, po-debconf, python3, python3-configobj, python3-httpretty, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-oauthlib, python3-pytest, python3-requests, python3-serial, python3-setuptools, python3-yaml Package-List: cloud-init deb admin optional arch=all Checksums-Sha1: 75f81b953c19c8f047805cdaf3e3a0dd3636f386 1168105 cloud-init_20.3-2-g371b392c.orig.tar.gz f4a92518ab038fc38719157034893826b6749564 73008 cloud-init_20.3-2-g371b392c-0ubuntu1~18.04.1.debian.tar.xz Checksums-Sha256: 979e84467e6b84cbd254379e8aaf5768ac6c605342aba8ddadfc20fb8d2f7e89 1168105 cloud-init_20.3-2-g371b392c.orig.tar.gz e55a7bb8259940493d793d0954c691995386623618dce299880a8da38e155be9 73008 cloud-init_20.3-2-g371b392c-0ubuntu1~18.04.1.debian.tar.xz Files: 5ed87c260ce0e4ece3f67e00be54b57f 1168105 cloud-init_20.3-2-g371b392c.orig.tar.gz 4261ed0cdeaa994d7c9519176e3bcdb1 73008 cloud-init_20.3-2-g371b392c-0ubuntu1~18.04.1.debian.tar.xz Python-Version: all -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEE4lRR4CIbV3Pev/F47NrLFgmVrYkFAl9IlmIZHGNoYWQuc21p dGhAY2Fub25pY2FsLmNvbQAKCRDs2ssWCZWtibBXEAClcALt7/+4tsdOUpQRR1mN WTt/R9qlhNgy2nKo0gsj82KrvMOuNuFn0CqLdK/X7NaAlVym78mVXVOh/aQfPR82 2PCTenmhYKIvBhD105O3FzqZk9DDjg+0dLY7joVuIngMIRAKjB+mH7Avhe/qk9om bGqUc+xnbNGyXvElYC54qqFH2bIoWWbdRaVtVEAXBF4PhTBVfPQIPrT7afTc2bS8 CHqct5y6c+yJbOxxcr5VbbxRlQkiN6s9hQFr48OuDnMaqd9Z3DL7z45wFTGTr4rP BiZbjXIZE45bJhKIW5ISkp0k0tvlg4uX4QnY15VB2TyvESVcTSwMfOZVdLPzWW5d slxVsVsPo2RjnT+s3j6Q41//dHbSZi7c2P4xWtU/aSK6rAd9hrLv3NRdcxTORqhX vO+5PVpca0AShahcr/U1no4qqHD0b5hOKl1Fzcn/CCyqgj/Sbh8gimwabQqo+mAF pbKs4Xj2J5TL8SG/ChvzBmsv+qeMqcB0EkQ1NRJ1S6eoAQ3ARJjvBRL+/to3/DFW x09GApyV9hNX7G8ueefqM4MfXOCuF2AWidehIRLxS+pBB+P60Zt3NvzmYlTd9HJE 2OcH54n7R/noy/rY+dkUiqk1LF/XXgw8fv3MnPfm3m2Th0NxFW/GvWgVbmVG+NC7 7ZDdizgCOc2/Bnf8Omyffw== =FR3L -----END PGP SIGNATURE----- Co-authored-by: Delphix Engineering <eng@delphix.com>
Contributor
Author
|
|
Contributor
Author
Contributor
|
Is there any differences with FYI if you want to merge with a branch and ignore any differences, you can run: Running this brings 6.0/stage to the same changes as master without any conflicts. |
Contributor
Author
|
Yea, I know about Since I now have a better idea that |
Contributor
Author
|
Closing in favor of #28 |
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
2 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.
No description provided.