Merge branch 'master' into assistant

This commit is contained in:
Joey Hess 2012-07-05 11:05:24 -06:00
commit e8df726d07

View file

@ -18,7 +18,7 @@ all the other git clones, at both the git level and the key/value level.
* enqueue Transfers (Uploads) as new files are added to the annex by * enqueue Transfers (Uploads) as new files are added to the annex by
Watcher. **done** Watcher. **done**
* enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by * enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by
Watcher. Watcher. **done**
* Write basic Transfer handling thread. Multiple such threads need to be * Write basic Transfer handling thread. Multiple such threads need to be
able to be run at once. Each will need its own independant copy of the able to be run at once. Each will need its own independant copy of the
Annex state monad. Annex state monad.