summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-02 15:10:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-02 15:10:29 -0400
commit6c84eaf5a01046a0fa175d75e7027f686e00a6ee (patch)
treef17a9dbbe95514ec5b2950b954b2279fb1b4d349 /debian
parent15b4cd87363a872d0d165fa1c02c48a8cb63cccf (diff)
Improve local pairing behavior when two computers both try to start the pairing process separately.
I was able to reproduce something very like this bug by starting pairing separately on both computers under poor network conditions (ie, weak wifi on my front porch). Neither computer showed an alert for the PairReq messages it was seeing (intermittently) from the other. So, I've made a new PairReq message that has not been seen before always make the alert pop up, even if the assistant thinks it is in the middle of its own pairing process (or even another pairing process with a different box on the LAN). (This shouldn't cause a rogue PairAck to disrupt a pairing process part way through.)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 193976ac9..6c743e19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (4.20131102) UNRELEASED; urgency=low
+
+ * Improve local pairing behavior when two computers both try to start
+ the pairing process separately.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400
+
git-annex (4.20131101) unstable; urgency=low
* The "git annex content" command is renamed to "git annex wanted".