summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-30 15:59:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-30 16:01:25 -0400
commitbaec0e627d5ea31131729274415041c01de2bcf0 (patch)
tree6eded2dae6870beb4dbd341cdd2877d1c26ee8ea
parentb8e0db34d877a5e209708a3f266ed3fe96343b1a (diff)
update changelog
Note that the note on d12b1fb179bc1744f813ea3f616d503d2b0dfe09 turned out to be wrong. Multiple repository pairing over XMPP does work, because the annex-uuid of the xmpp remote is updated to the uuid of the new repo when pairing takes place. So the push from it is accepted. (And the other UUIDs are listed in uuid.log, so pushes from those repositories also are accepted of course.)
-rw-r--r--debian/changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8b23ffea7..d3b520424 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,11 @@ git-annex (4.20130418) UNRELEASED; urgency=low
S3, Glacier, and Box.com remotes.
* Store an annex-uuid file in the bucket when setting up a new S3 remote.
* Support building with DAV 0.4.
+ * assistant: Improved XMPP protocol to better support multiple repositories
+ using the same XMPP account. Fixes bad behavior when sharing with a friend
+ when you or the friend have multiple reposotories on an XMPP account.
+ Note that XMPP pairing with your own devices still pairs with all
+ repositories using your XMPP account.
-- Joey Hess <joeyh@debian.org> Thu, 18 Apr 2013 16:22:48 -0400