diff options
| author | James Falcon <james.falcon@canonical.com> | 2020-08-26 12:49:05 -0500 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2020-08-26 20:34:09 +0000 |
| commit | f0ca38837f5d7c5eadf2306493feb183b6f40093 (patch) | |
| tree | 0fab3e19ff1f95ac15d00a0fbeb3a26b2c8765d0 | |
| parent | 34a9ecdb278a3e5fe2511529a21ff688f8823f12 (diff) | |
| download | cloud-init-git-f0ca38837f5d7c5eadf2306493feb183b6f40093.tar.gz | |
20.3-2-g371b392c-0ubuntu1 (patches unapplied)
Imported using git-ubuntu import.
| -rw-r--r-- | cloudinit/util.py | 1 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | doc/examples/cloud-config-chef.txt | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index cf9e349f..64142f23 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2490,7 +2490,6 @@ def read_dmi_data(key): LOG.debug("dmidata is not supported on %s", uname_arch) return None - print("hi, now its: %s\n", subp) dmidecode_path = subp.which('dmidecode') if dmidecode_path: return _call_dmidecode(key, dmidecode_path) diff --git a/debian/changelog b/debian/changelog index e9437462..ead410b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cloud-init (20.3-2-g371b392c-0ubuntu1) groovy; urgency=medium + + * New upstream snapshot. + - util: remove debug statement (#556) [Joshua Powers] + - Fix cloud config on chef example (#551) [lucasmoura] + + -- James Falcon <james.falcon@canonical.com> Wed, 26 Aug 2020 12:49:05 -0500 + cloud-init (20.3-0ubuntu1) groovy; urgency=medium * New upstream release. diff --git a/doc/examples/cloud-config-chef.txt b/doc/examples/cloud-config-chef.txt index bb4b058c..8cebfd80 100644 --- a/doc/examples/cloud-config-chef.txt +++ b/doc/examples/cloud-config-chef.txt @@ -13,7 +13,8 @@ # Key from https://packages.chef.io/chef.asc apt: sources: - source1: "deb http://packages.chef.io/repos/apt/stable $RELEASE main" + source1: + source: "deb http://packages.chef.io/repos/apt/stable $RELEASE main" key: | -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.12 (Darwin) |