diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
| commit | 24e32edfc4dbce532dde1d858fbdd7beebefb3aa (patch) | |
| tree | 9aeba34bc027109687a3a429c675cb33a10a56e5 /cloudinit/util.py | |
| parent | 4de52eb92333245f2c88e386d57c16547b89ab97 (diff) | |
| parent | 38c851e58e09c5574661ef4b2d2e66f6e38063d1 (diff) | |
| download | vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.tar.gz vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index ee5e5c0a..bf8e7d80 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1966,7 +1966,7 @@ def pathprefix2dict(base, required=None, optional=None, delim=os.path.sep): def read_meminfo(meminfo="/proc/meminfo", raw=False): # read a /proc/meminfo style file and return # a dict with 'total', 'free', and 'available' - mpliers = {'kB': 2**10, 'mB': 2 ** 20, 'B': 1, 'gB': 2 ** 30} + mpliers = {'kB': 2 ** 10, 'mB': 2 ** 20, 'B': 1, 'gB': 2 ** 30} kmap = {'MemTotal:': 'total', 'MemFree:': 'free', 'MemAvailable:': 'available'} ret = {} |