Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
Albert Santoni 2014-06-09 11:37:06 -04:00
commit fa3c7bd67a
9 changed files with 29 additions and 10 deletions

View file

@ -16,7 +16,7 @@ class SystemstatusController extends Zend_Controller_Action
$services = array(
"pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
"liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
//"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
);
$partitions = Application_Model_Systemstatus::GetDiskInfo();