sintonia/python_apps/media-monitor
Martin Konecny c19b7f7c6e Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
2011-11-14 21:19:56 -05:00
..
airtimefilemonitor CC-3016: Import files doesn't work on Debian(1.9.5, 2.0) 2011-11-09 13:36:08 -05:00
install CC-2758: Make airtime-install script Debian/Ubuntu compatible 2011-11-01 22:43:12 -04:00
MediaMonitor.py CC-3016: Import files doesn't work on Debian(1.9.5, 2.0) 2011-11-03 15:26:10 -04:00
airtime-media-monitor CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts 2011-09-08 12:36:51 -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.cfg CC-2566: Separate URL config out of config files and put them with API_CLIENT 2011-07-19 19:42:23 -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