Merge ~chad.smith/cloud-init:ubuntu/artful into cloud-init:ubuntu/artful

[Chad Smith]

Proposing a sync of tip for release into Artful using fixes to new-upstream-release.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:4301a2fcc26530723ae95dba0ac4b64ac284a030
https://jenkins.ubuntu.com/server/job/cloud-init-ci/953/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/953/rebuild

review: Approve (continuous-integration)

diff --git a/debian/changelog b/debian/changelog
index c7fc4fc..e91c0c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 cloud-init (18.2-0ubuntu1~17.10.1) artful-proposed; urgency=medium
 
+<<<<<<< debian/changelog
   * Drop the following cherry picks in debian/patches. They are now
     incorporated now incorporated in the upstream source:
     + cpick-40e7738-GCE-fix-reading-of-user-data-that-is-not-base64-encoded
@@ -10,12 +11,23 @@ cloud-init (18.2-0ubuntu1~17.10.1) artful-proposed; urgency=medium
       (LP: #1759307)
     - FreeBSD: resizefs module now able to handle zfs/zpool.
       [Dominic Schlegel] (LP: #1721243)
+=======
+  * Drop the following cherry picks in debian/patches.
+    They are now incorporated in the upstream source:
+    + cpick-40e7738-GCE-fix-reading-of-user-data-that-is-not-base64-encoded
+  * New upstream release. (LP: #1759406)
+    - release 18.2
+    - Hetzner: Exit early if dmi system-manufacturer is not Hetzner.
+    - Add missing dependency on isc-dhcp-client to trunk ubuntu packaging.
+    - FreeBSD: resizefs module now able to handle zfs/zpool. [Dominic Schlegel]
+>>>>>>> debian/changelog
     - cc_puppet: Revert regression of puppet creating ssl and ssl_cert dirs
     - Enable IBMCloud datasource in settings.py.
     - IBMCloud: Initial IBM Cloud datasource.
     - tests: remove jsonschema from xenial tox environment.
     - tests: Fix newly added schema unit tests to skip if no jsonschema.
     - ec2: Adjust ec2 datasource after exception_cb change.
+<<<<<<< debian/changelog
     - Reduce AzurePreprovisioning HTTP timeouts.
       [Douglas Jordan] (LP: #1752977)
     - Revert the logic of exception_cb in read_url.
@@ -27,10 +39,19 @@ cloud-init (18.2-0ubuntu1~17.10.1) artful-proposed; urgency=medium
       [Kurt Garloff] (LP: #1756471)
     - datasources: fix DataSource subclass get_hostname method signature
       (LP: #1757176)
+=======
+    - Reduce AzurePreprovisioning HTTP timeouts. [Douglas Jordan]
+    - Revert the logic of exception_cb in read_url. [Kurt Garloff]
+    - ubuntu-advantage: Add new config module to support ubuntu-advantage-tools
+    - Handle global dns entries in netplan
+    - Identify OpenTelekomCloud Xen as OpenStack DS. [Kurt Garloff]
+    - datasources: fix DataSource subclass get_hostname method signature
+>>>>>>> debian/changelog
     - OpenNebula: Update network to return v2 config rather than ENI.
       [Akihiko Ota]
     - Add Hetzner Cloud DataSource
     - net: recognize iscsi root cases without ip= on kernel command line.
+<<<<<<< debian/changelog
       (LP: #1752391)
     - tests: fix flakes warning for unused variable
     - tests: patch leaked stderr messages from snap unit tests
@@ -71,6 +92,40 @@ cloud-init (18.2-0ubuntu1~17.10.1) artful-proposed; urgency=medium
     - tools: run-centos: git clone rather than tar.
 
  -- Chad Smith <[e-mail]>  Tue, 27 Mar 2018 20:21:42 -0600
+=======
+    - tests: fix flakes warning for unused variable
+    - tests: patch leaked stderr messages from snap unit tests
+    - cc_snap: Add new module to install and configure snapd and snap packages.
+    - tests: Make pylint happy and fix python2.6 uses of assertRaisesRegex.
+    - netplan: render bridge port-priority values
+    - util: Fix subp regression. Allow specifying subp command as a string.
+    - doc: fix all warnings issued by 'tox -e doc'
+    - FreeBSD: Set hostname to FQDN. [Dominic Schlegel]
+    - tests: fix run_tree and bddeb
+    - tests: Fix some warnings in tests that popped up with newer python.
+    - set_hostname: When present in metadata, set it before network bringup.
+    - tests: Centralize and re-use skipTest based on json schema presense.
+    - This commit fixes get_hostname on the AzureDataSource. [Douglas Jordan]
+    - shellify: raise TypeError on bad input.
+    - Make salt minion module work on FreeBSD. [Dominic Schlegel]
+    - Simplify some comparisions. [Rémy Léone]
+    - Change some list creation and population to literal. [Rémy Léone]
+    - GCE: fix reading of user-data that is not base64 encoded.
+    - doc: fix chef install from apt packages example in RTD.
+    - Implement puppet 4 support [Romanos Skiadas]
+    - subp: Fix subp usage with non-ascii characters when no system locale.
+    - salt: configure grains in grains file rather than in minion config.
+      [Daniel Wallace]
+    - release 18.1
+    - OVF: Fix VMware support for 64-bit platforms. [Sankar Tanguturi]
+    - ds-identify: Fix searching for iso9660 OVF cdroms.
+    - SUSE: Fix groups used for ownership of cloud-init.log [Robert Schweikert]
+    - ds-identify: check /writable/system-data/ for nocloud seed.
+    - tests: run nosetests in cloudinit/ directory, fix py26 fallout.
+    - tools: run-centos: git clone rather than tar.
+
+ -- Chad Smith <[e-mail]>  Wed, 28 Mar 2018 13:08:59 -0600
+>>>>>>> debian/changelog
 
 cloud-init (17.2-35-gf576b2a2-0ubuntu1~17.10.2) artful-proposed; urgency=medium