 Dan Ballard
|
95cf039d0e
|
Merge remote branch 'rob/master'
Conflicts:
sensors/cpu.py
sensors/memory.py
|
2012-04-07 21:27:59 -07:00 |
|
Dan Ballard
|
2f21356a9e
|
memor monitor pulls buffer and cache data... but doesnt give it out
|
2012-04-07 21:20:24 -07:00 |
Robert Hausch
|
c5134d1b21
|
Minor fixes in json encoding. Increased polling speed
|
2012-04-07 21:11:52 -07:00 |
|
Dan Ballard
|
523e57e238
|
modularize and make loading psutil dependant code check if psutil is tehre first. Add more license boilerplate
|
2012-04-07 20:36:32 -07:00 |
|
Robert Hausch
|
17cadcd440
|
Now with valid JSON format :D
|
2012-04-07 17:46:42 -07:00 |
|
Dan Ballard
|
144390e546
|
remove accidently commited files
|
2012-04-07 17:06:13 -07:00 |
|
Robert Hausch
|
aaad5f5837
|
Added Memory monitor
|
2012-04-07 17:04:36 -07:00 |