EnGage

Merge lp:~isoschiz/engage/cached into lp:engage

  1. cached
  2. Merge into victoria
Proposed by Martin Morrison
Status: Merged
Approved by: Simon C
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~isoschiz/engage/cached
Merge into: lp:engage
Diff against target: 12 lines (+1/-1)
1 file modified
src/engage/monitor/percent_used.py (+1/-1)
To merge this branch: bzr merge lp:~isoschiz/engage/cached
Reviewer Review Type Date Requested Status
Simon C Approve
Review via email: mp+130716@code.launchpad.net

Commit message

Merge cached memory accounting fix.

Description of the change

Fix cached memory accounting in percent_used.

To post a comment you must log in.
Revision history for this message
Simon C (slimey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/engage/monitor/percent_used.py'
2--- src/engage/monitor/percent_used.py 2012-09-25 12:44:16 +0000
3+++ src/engage/monitor/percent_used.py 2012-10-21 21:33:22 +0000
4@@ -35,7 +35,7 @@
5 total, free, buffers, cached = \
6 [int(f.readline().split()[1]) for i in xrange(0, 4)]
7 mem_used = percent(total - free - buffers - cached, total)
8- mem_buff = percent(buffers, total)
9+ mem_buff = percent(buffers + cached, total)
10
11 # Disk
12 df = os.statvfs(self.cfg['path'])

Subscribers

People subscribed via source and target branches