Merge branch 'cc-4661-listener-statistics' into devel

Conflicts:
	python_apps/api_clients/api_client.py
This commit is contained in:
James 2012-11-07 17:20:12 -05:00
commit 7300b608cf
52 changed files with 22519 additions and 14 deletions

View file

@ -121,3 +121,6 @@ notify_webstream_data = 'notify-webstream-data/api_key/%%api_key%%/media_id/%%me
notify_liquidsoap_started = 'rabbitmq-do-push/api_key/%%api_key%%/format/json'
get_stream_parameters = 'get-stream-parameters/api_key/%%api_key%%/format/json'
push_stream_stats = 'push-stream-stats/api_key/%%api_key%%/format/json'