Merge branch 'clinton-hall/dev'

Conflicts:
	autoProcess/autoProcessMovie.py
	autoProcess/autoProcessMusic.py
	autoProcess/autoProcessTV.py
	autoProcess/migratecfg.py
	autoProcess/nzbToMediaUtil.py
This commit is contained in:
echel0n 2014-04-01 21:48:57 -07:00
commit 6cffd5364d
13 changed files with 96 additions and 44 deletions

View file

@ -53,10 +53,15 @@
# set to 1 to delete failed, or 0 to leave files in place.
#cpsdelete_failed=0
# CouchPotato process Time Per GiB
#
# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
#cpsTimePerGiB=60
# CouchPotato wait_for
#
# Set the number of minutes to wait before timing out. If transfering files across drives or network, increase this to longer than the time it takes to copy a movie.
#cpswait_for=5
# Set the number of minutes to wait after calling the renamer, to check the movie has changed status.
#cpswait_for=2
# CouchPotatoServer and NZBGet are a different system (0, 1).
#