diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2012-12-19 18:12:37 +0100 |
|---|---|---|
| committer | Vlastimil Holer <vlastimil.holer@gmail.com> | 2012-12-19 18:12:37 +0100 |
| commit | 268cdf3458849eb7be41253c38a86c68bbddde59 (patch) | |
| tree | 55cb16940dca00fb7aa8f18bd81696187bdf4620 /cloudinit/sources | |
| parent | 8dd9678d97a822e477915c150d528096a83c9777 (diff) | |
| download | vyos-cloud-init-268cdf3458849eb7be41253c38a86c68bbddde59.tar.gz vyos-cloud-init-268cdf3458849eb7be41253c38a86c68bbddde59.zip | |
Remove conflicting merge block
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/__init__.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index f98493de..0bad4c8b 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -163,7 +163,6 @@ class DataSource(object): # make up a hostname (LP: #475354) in format ip-xx.xx.xx.xx lhost = self.metadata['local-hostname'] if util.is_ipv4(lhost): -<<<<<<< TREE toks = [] if resolve_ip: toks = util.gethostbyaddr(lhost) @@ -172,9 +171,6 @@ class DataSource(object): toks = toks.split('.') else: toks = ["ip-%s" % lhost.replace(".", "-")] -======= - toks = ["ip-%s" % lhost.replace(".", "-")] ->>>>>>> MERGE-SOURCE else: toks = lhost.split(".") |