Merge lp:~dannf/charms/precise/mysql/lp1188424 into lp:charms/mysql

Proposed by dann frazier
Status: Merged
Approved by: Mark Mims
Approved revision: 100
Merged at revision: 101
Proposed branch: lp:~dannf/charms/precise/mysql/lp1188424
Merge into: lp:charms/mysql
Diff against target: 24 lines (+6/-1)
1 file modified
hooks/config-changed (+6/-1)
To merge this branch: bzr merge lp:~dannf/charms/precise/mysql/lp1188424
Reviewer Review Type Date Requested Status
Mark Mims (community) Approve
Review via email: mp+167881@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mark Mims (mark-mims) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/config-changed'
--- hooks/config-changed 2013-03-15 14:55:25 +0000
+++ hooks/config-changed 2013-06-07 00:35:37 +0000
@@ -7,6 +7,7 @@
7import hashlib7import hashlib
8import os8import os
9import sys9import sys
10import platform
10from string import upper11from string import upper
1112
12num_re = re.compile('^[0-9]+$')13num_re = re.compile('^[0-9]+$')
@@ -38,7 +39,11 @@
38 IS_32BIT_SYSTEM = sys.maxsize < 2**3239 IS_32BIT_SYSTEM = sys.maxsize < 2**32
39except OverflowError:40except OverflowError:
40 IS_32BIT_SYSTEM = True41 IS_32BIT_SYSTEM = True
41SYS_MEM_LIMIT = human_to_bytes('4G')42
43if platform.machine() in ['armv7l']:
44 SYS_MEM_LIMIT = human_to_bytes('2700M') # experimentally determined
45else:
46 SYS_MEM_LIMIT = human_to_bytes('4G')
4247
43if IS_32BIT_SYSTEM:48if IS_32BIT_SYSTEM:
44 check_call(['juju-log','-l','INFO','32bit system restrictions in play'])49 check_call(['juju-log','-l','INFO','32bit system restrictions in play'])

Subscribers

People subscribed via source and target branches