diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2016-05-19 14:26:30 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2016-05-19 14:26:30 -0700 |
| commit | 6b97c4e462b19374d6af807b1f5b9c087aa97996 (patch) | |
| tree | 3628a55f69b61644a519d5df40398d55ba55186c /cloudinit/sources/DataSourceSmartOS.py | |
| parent | ea4bc2c603a9d964a918e01d00e39a851e979830 (diff) | |
| parent | 880d9fc2f9c62abf19b1506595aa81e5417dea45 (diff) | |
| download | vyos-cloud-init-6b97c4e462b19374d6af807b1f5b9c087aa97996.tar.gz vyos-cloud-init-6b97c4e462b19374d6af807b1f5b9c087aa97996.zip | |
Remerge against head/master
Diffstat (limited to 'cloudinit/sources/DataSourceSmartOS.py')
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index 6cbd8dfa..c7641eb3 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -40,13 +40,11 @@ import re import socket import stat -import serial - from cloudinit import log as logging +from cloudinit import serial from cloudinit import sources from cloudinit import util - LOG = logging.getLogger(__name__) SMARTOS_ATTRIB_MAP = { |