This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 84f5b36d9246b4edfe69f8d455052ee4f49c5b7a Merge: 220d110 214ba02 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Fri Jul 10 19:54:06 2015 +0200 Merge branch 'develop' of https://git.chorem.org/mum into develop README | 2 +- app/module_loader.py | 3 + app/modules/connection_modules/ssh.py | 2 +- app/modules/monitoring_modules/disk_snmp_linux.py | 3 + app/modules/monitoring_modules/disk_ssh_linux.py | 4 + app/modules/monitoring_modules/memory_ssh_linux.py | 2 +- app/modules/storage_modules/shelve_db.py | 18 +++++ app/mum.py | 13 ++-- app/websocket_func.py | 19 ++++- static/js/controllers/dashboardCtrl.js | 4 + static/js/controllers/headCtrl.js | 31 +++++++- static/js/controllers/hostPageCtrl.js | 89 +++++++++++++++------- views/dashboard.html | 34 +++++++++ views/hostpage.html | 46 +++++------ views/index.html | 23 +++++- 15 files changed, 227 insertions(+), 66 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.