x/cloud-init
Code Issues Proposed changes

merge from trunk

Browse Source
This commit is contained in:
Scott Moser 2014-01-29 14:31:47 -05:00
commit a6cd0e8a3c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@
- configdrive: consider partitions as possible datasources if they have - configdrive: consider partitions as possible datasources if they have
theh correct filesystem label. [Paul Querna] theh correct filesystem label. [Paul Querna]
- initial freebsd support [Harm Weites] - initial freebsd support [Harm Weites]
- fix in is_ipv4 to accept IP addresses with a '0' in them.
0.7.4: 0.7.4:
- fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a
partitioned block device with target filesystem on ephemeral0.1. partitioned block device with target filesystem on ephemeral0.1.

2
cloudinit/util.py
View File

@ -369,7 +369,7 @@ def is_ipv4(instr):
return False return False
try: try:
toks = [x for x in toks if int(x) < 256 and int(x) > 0] toks = [x for x in toks if int(x) < 256 and int(x) >= 0]
except: except:
return False return False