Merge remote-tracking branch 'cwebber/254_delete_queue_directories'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Mon, 8 Apr 2013 13:57:06 +0000 (15:57 +0200)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Mon, 8 Apr 2013 13:57:06 +0000 (15:57 +0200)
commit2dd0af36359a50efbef7dfefaea1f05ae633325c
tree6bd361d903e5114bae53a695191665dab39c1eaa
parent0c0f31c4efd2b4d849aaf8efaee7ecf6829d4f6c
parent0ac8317ddceee6d705c175e69c0825078246c7b9
Merge remote-tracking branch 'cwebber/254_delete_queue_directories'

* cwebber/254_delete_queue_directories:
  Removing docstring bit about delete_file possibly deleting directories in the future
  Convert media processing backends to delete the queue directory (#254)
  Implement delete_dir in the FileStorage

Conflicts:
mediagoblin/media_types/image/processing.py
mediagoblin/media_types/video/processing.py

Conflicts, because those media_types already use the newer
proc_state.delete_queue_file() method (which needs
updating.
mediagoblin/media_types/ascii/processing.py
mediagoblin/media_types/audio/processing.py
mediagoblin/media_types/stl/processing.py
mediagoblin/storage/__init__.py
mediagoblin/storage/filestorage.py