diff options
author | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
commit | 24e32edfc4dbce532dde1d858fbdd7beebefb3aa (patch) | |
tree | 9aeba34bc027109687a3a429c675cb33a10a56e5 /cloudinit/distros/net_util.py | |
parent | 4de52eb92333245f2c88e386d57c16547b89ab97 (diff) | |
parent | 38c851e58e09c5574661ef4b2d2e66f6e38063d1 (diff) | |
download | vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.tar.gz vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.zip |
merge from trunk
Diffstat (limited to 'cloudinit/distros/net_util.py')
-rw-r--r-- | cloudinit/distros/net_util.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py index dd63a6a3..8b28e2d1 100644 --- a/cloudinit/distros/net_util.py +++ b/cloudinit/distros/net_util.py @@ -180,4 +180,3 @@ def translate_network(settings): if cmd == 'iface' and 'inet6' in args: real_ifaces[dev_name]['inet6'] = True return real_ifaces - |