Martin Konecny 6500c3312d Merge branch '2.2.x' ...

Conflicts:
	install_minimal/airtime-install
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py

2012-10-26 00:31:12 -04:00

..

airtimefilemonitor

Merge branch '2.2.x'

2012-10-26 00:31:12 -04:00

install

cc-4105: updated config and installation scripts

2012-08-14 14:50:43 -04:00

airtime-media-monitor

cc-4105: updated config and installation scripts

2012-08-14 14:50:43 -04:00

airtime-media-monitor-init-d

CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder

2011-09-28 12:15:13 -04:00

logging.cfg

CC-2633: media monitor crashes on non-ascii files and metadata

2011-08-05 15:12:55 -04:00

media_monitor.py

cc-4105: updated config and installation scripts

2012-08-14 14:50:43 -04:00

media-monitor.cfg

cc-4235: removed some magic to find bug

2012-08-16 10:26:57 -04:00

mm1.py

cc-4105: added some changes to ease installation

2012-08-14 14:50:43 -04:00

monit-airtime-media-monitor.cfg

CC-2888: Create a monit file for each airtime component

2011-09-26 14:40:26 -04:00