diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
| commit | 81156aa423309c72f17709eea994e7e06ebc431c (patch) | |
| tree | 4ee78fb024c5f03a3c12e39e1adfc1b0cb84063b /cloudinit/config/cc_ubuntu_init_switch.py | |
| parent | 14040a9c8df6e8406acb79fd653873bb05cb4d40 (diff) | |
| parent | ea4bc2c603a9d964a918e01d00e39a851e979830 (diff) | |
| download | vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.tar.gz vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.zip | |
rebased with upstream and reolved merge conflicts
Diffstat (limited to 'cloudinit/config/cc_ubuntu_init_switch.py')
| -rw-r--r-- | cloudinit/config/cc_ubuntu_init_switch.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ubuntu_init_switch.py b/cloudinit/config/cc_ubuntu_init_switch.py index 7e88ed85..884d79f1 100644 --- a/cloudinit/config/cc_ubuntu_init_switch.py +++ b/cloudinit/config/cc_ubuntu_init_switch.py @@ -40,10 +40,10 @@ It can be configured with the following option structure:: mechanism you've used to switch the init system. """ -from cloudinit.settings import PER_INSTANCE +from cloudinit.distros import ubuntu from cloudinit import log as logging +from cloudinit.settings import PER_INSTANCE from cloudinit import util -from cloudinit.distros import ubuntu import os import time |