diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-22 13:10:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-22 13:10:16 -0400 |
| commit | cd44bfb832996c68d80697c0711db402ffa4334e (patch) | |
| tree | 4f8c137c10760857eb299b163e02e23fbc25bf46 /doc/design | |
| parent | 81c9b1b5075f7e76e51c6f666cf16297a05a6cc5 (diff) | |
| parent | 60d05717e790bfd13372ee971928dc42cbbfb5bb (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/assistant/blog/day_270__release_and_xmpp.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/design/assistant/blog/day_270__release_and_xmpp.mdwn b/doc/design/assistant/blog/day_270__release_and_xmpp.mdwn index 96adee3bf..eb28f97bd 100644 --- a/doc/design/assistant/blog/day_270__release_and_xmpp.mdwn +++ b/doc/design/assistant/blog/day_270__release_and_xmpp.mdwn @@ -18,12 +18,12 @@ queuing other messages, seems to be just wrong. This is code I wrote in the fall, and have basically not touched since. And it shows. Spent 4 hours this morning rewriting it. Went all Erlang and implemented message inboxes using STM. I'm much more confident it won't drop messages on the -floor, which the old code certianly did do sometimes. +floor, which the old code certainly did do sometimes. -Added a check to avoid unncessary pushes over XMPP. Unfortunately, this +Added a check to avoid unnecessary pushes over XMPP. Unfortunately, this required changing the protocol in a way that will make previous versions of git-annex refuse to accept any pushes advertised by this version. Could not -find a way around that, but there were so many unncessary pushes happening +find a way around that, but there were so many unnecessary pushes happening (and possibly contributing to other problems) that it seemed worth the upgrade pain. |