diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-01 21:10:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-01 21:10:12 -0400 |
| commit | 3b55dc004210bfb116b84552b372e0bb0631cf68 (patch) | |
| tree | 5789a7a6d1f10c257bff452e04ccb35aec99e605 /doc/design | |
| parent | 1e3e0f31fcef6eea11e707d3f91eea6532cb969e (diff) | |
| parent | debcec9e756fc56b445635f2177ae63a7ca23b67 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/assistant/blog/day_251__xmpp_improvements.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn b/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn index 35dc86b38..7007d7c0d 100644 --- a/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn +++ b/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn @@ -3,7 +3,7 @@ since February, or possibly earlier, not counting trips. Whoops! Also, I was feeling overwhelmed with the complexity of fixing XMPP to not be buggy when there are multiple separate repos using the same XMPP -account. Let my subconcious work on that, and last night it served up the +account. Let my subconscious work on that, and last night it served up the solution, in detail. Built it today. It's only a partial solution, really. If you want to use the same XMPP @@ -21,7 +21,7 @@ Before, it would merge them all together without warning. ---- While I was testing that, I think I found out the real reason why XMPP -pushes have seemed a little unrelaible. It turns out to not be an XMPP +pushes have seemed a little unreliable. It turns out to not be an XMPP issue at all! Instead, the merger was simply not always noticing when `git receive-pack` updated a ref, and not merging it into master. That was easily fixed. |