 Dan Ballard
|
649b56390b
|
Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon
Conflicts:
monitor.py
|
2012-04-07 16:50:16 -07:00 |
Robert Hausch
|
2ec58e6d51
|
Added CPU usage
|
2012-04-07 16:47:30 -07:00 |
|
Dan Ballard
|
21f62fd994
|
stats locking
|
2012-04-07 16:43:54 -07:00 |
|
Dan Ballard
|
e51a76116e
|
basic server sits on port and listens and spits out canned json message
|
2012-04-07 16:01:28 -07:00 |
|
Robert Hausch
|
7d0c4922e0
|
Merge pull request #1 from dballard/master
license
|
2012-04-07 14:59:13 -07:00 |
|
Dan Ballard
|
6cce91d67e
|
Adding GPL v3 License
|
2012-04-07 14:56:32 -07:00 |
|
Robert Hausch
|
aba77ffa37
|
first commit
|
2012-04-07 14:47:27 -07:00 |