Merge branch 'master' into p2p_locking

This commit is contained in:
Joey Hess 2024-07-04 09:52:02 -04:00
commit 98dbfb6bbd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -33,7 +33,7 @@ Planned schedule of work:
right in the http protocol from the beginning. right in the http protocol from the beginning.
Status: Content retention files implemented. P2P LOCKCONTENT uses a 10 Status: Content retention files implemented. P2P LOCKCONTENT uses a 10
minute retention in case it gets killed. Need to implement PRE-REMOVE. minute retention in case it gets killed. P2P protocol changes started.
* websockets or something else for LOCKCONTENT over http? * websockets or something else for LOCKCONTENT over http?