summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-08-06 11:37:07 +0100
committerScott Moser <smoser@ubuntu.com>2013-08-06 11:37:07 +0100
commit9661db0561ff15b888f681a44d9aa02a17de074c (patch)
treeb7ef1f34b38f991ea88e7f6e2563e48cedceeb6e /cloudinit
parent13566b6833e9bca2a5c1bbe9ad7639089f170c4a (diff)
parent2e4d57b867b71831270655956d06a8e14793a8f3 (diff)
downloadvyos-cloud-init-9661db0561ff15b888f681a44d9aa02a17de074c.tar.gz
vyos-cloud-init-9661db0561ff15b888f681a44d9aa02a17de074c.zip
merge from trunk
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/distros/rhel.py2
-rw-r--r--cloudinit/distros/sles.py2
2 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index ece1a5ff..30195384 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -20,8 +20,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
-
from cloudinit import distros
from cloudinit import helpers
from cloudinit import log as logging
diff --git a/cloudinit/distros/sles.py b/cloudinit/distros/sles.py
index 92a1c307..f2ac4efc 100644
--- a/cloudinit/distros/sles.py
+++ b/cloudinit/distros/sles.py
@@ -18,8 +18,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
-
from cloudinit import distros
from cloudinit.distros.parsers.hostname import HostnameConf