I appreciated all your review and help in the past 2 months.
Thanks
Hongjiang Zhang
-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Scott Moser
Sent: Thursday, May 11, 2017 1:05 AM
To: <email address hidden>
Subject: Re: [Merge] ~redriver/cloud-init:frbsd-azure-branch into cloud-init:master
Review: Approve
I've merged this.
The diff from the merged commit (0a71d5a870b416f2c86c8bc196004bb3fc0768a0)
to your tip (0ff61d4) when rebased is just:
Hi Scott,
Great to see it is merged finally!
I appreciated all your review and help in the past 2 months.
Thanks
Hongjiang Zhang
-----Original Message----- cloud-init: frbsd-azure- branch into cloud-init:master
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Scott Moser
Sent: Thursday, May 11, 2017 1:05 AM
To: <email address hidden>
Subject: Re: [Merge] ~redriver/
Review: Approve
I've merged this. f2c86c8bc196004 bb3fc0768a0)
The diff from the merged commit (0a71d5a870b416
to your tip (0ff61d4) when rebased is just:
diff --git a/cloudinit/ distros/ freebsd. py b/cloudinit/ distros/ freebsd. py index d9f31bfd..bad112fe 100644 distros/ freebsd. py distros/ freebsd. py distros. Distro) :
--- a/cloudinit/
+++ b/cloudinit/
@@ -272,7 +272,7 @@ class Distro(
cmd = ['ifconfig', '-l']
(nics, err) = util.subp(cmd, rcs=[0, 1])
if len(err):
- LOG.warn("Error running %s: %s", cmd, err)
+ LOG.warning("Error running %s: %s", cmd, err)
return None
return nics
@@ -281,7 +281,7 @@ class Distro( distros. Distro) :
(if_result, err) = util.subp(cmd, rcs=[0, 1])
cmd = ['ifconfig', ifname]
if len(err):
- LOG.warn("Error running %s: %s", cmd, err)
+ LOG.warning("Error running %s: %s", cmd, err)
return None
return if_result
@@ -290,7 +290,7 @@ class Distro( distros. Distro) :
cmd = ['ifconfig', '-l', 'ether']
(nics, err) = util.subp(cmd, rcs=[0, 1])
if len(err):
- LOG.warn("Error running %s: %s", cmd, err)
+ LOG.warning("Error running %s: %s", cmd, err)
return None
return nics
diff --git a/setup.py b/setup.py examples/ seed/*' ) if is_f(f)]), r/dispatcher. d/', ['tools/ hook-network- manager' ]), r/dispatcher. d/', hook-network- manager' ]), dhclient- exit-hooks. d/', ['tools/ hook-dhclient' ]), *.rules' )])
index 46d05219..4616599b 100755
--- a/setup.py
+++ b/setup.py
@@ -173,8 +173,9 @@ else:
[f for f in glob('doc/
]
if os.uname()[0] != 'FreeBSD':
- data_files.append([
- (ETC + '/NetworkManage
+ data_files.extend([
+ (ETC + '/NetworkManage
+ ['tools/
(ETC + '/dhcp/
(LIB + '/udev/rules.d', [f for f in glob('udev/
])
-- /na01.safelinks .protection. outlook. com/?url= https:% 2F%2Fcode. launchpad. net%2F~ redriver% 2Fcloud- init%2F% 2Bgit%2Fcloud- init%2F% 2Bmerge% 2F314895& data=02% 7C01%7Chonzhan% 40microsoft. com%7C6ecd4fba7 ef945442b5008d4 97c6a74e% 7C72f988bf86f14 1af91ab2d7cd011 db47%7C1% 7C0%7C636300326 842539159& sdata=LLwO0W1% 2F0bm4EoNr% 2BFlbUZmPEphENy RUv1cF1IafsN8% 3D&reserved= 0 cloud-init: frbsd-azure- branch.
https:/
You are the owner of ~redriver/