diff options
| author | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
|---|---|---|
| committer | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
| commit | a9e4009ae7221ea167b3e1083a887564483e0350 (patch) | |
| tree | a370bd47399b1517c21b89d68aefd5afc15c5418 /cloudinit/distros/__init__.py | |
| parent | 4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip | |
Fix merge conflict
Diffstat (limited to 'cloudinit/distros/__init__.py')
| -rw-r--r-- | cloudinit/distros/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index e364080f..a912f373 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -39,8 +39,9 @@ from cloudinit.distros.parsers import hosts OSFAMILIES = { 'debian': ['debian', 'ubuntu'], 'redhat': ['fedora', 'rhel'], - 'suse': ['sles'], 'gentoo': ['gentoo'], + 'freebsd': ['freebsd'], + 'suse': ['sles'] } LOG = logging.getLogger(__name__) |