Merge branch 'master' of dev.sourcefabric.org:airtime

Conflicts:
	python_apps/api_clients/api_client.py
This commit is contained in:
martin 2011-03-29 18:35:57 -04:00
commit eb74c5718f
13 changed files with 124 additions and 47 deletions

View file

@ -20,3 +20,9 @@ show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
# URL to upload the recorded show's file to Airtime
upload_file_url = 'upload-recorded/format/json/api_key/%%api_key%%'
#number of retries to upload file if connection problem
upload_retries = 3
#time to wait between attempts to upload file if connection problem (in seconds)
upload_wait = 60