Merge branch 'master' into assistant

This commit is contained in:
Joey Hess 2012-07-05 17:35:19 -06:00
commit 0c563c39df

View file

@ -26,6 +26,7 @@ all the other git clones, at both the git level and the key/value level.
**done** **done**
* Check that download transfer triggering code works (when a symlink appears * Check that download transfer triggering code works (when a symlink appears
and the remote does *not* upload to us. and the remote does *not* upload to us.
* Investigate why transfers seem to block other git-annex assistant work.
* At startup, and possibly periodically, look for files we have that * At startup, and possibly periodically, look for files we have that
location tracking indicates remotes do not, and enqueue Uploads for location tracking indicates remotes do not, and enqueue Uploads for
them. Also, enqueue Downloads for any files we're missing. them. Also, enqueue Downloads for any files we're missing.