diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-17 13:29:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-17 13:29:10 -0400 |
| commit | caadeb495bd603a6f2b19064c4aaaec752bc3b6d (patch) | |
| tree | a9ff9380331c93c0c4c4ab4b2f78d1c8b6f0ad58 /doc/design/assistant/xmpp.mdwn | |
| parent | 63f72a295e4607061f768068e310a446bec806aa (diff) | |
| parent | 922e0d2c13d2c9105beeb18fe4eeb90dbddea76c (diff) | |
Merge branch 'master' into desymlink
Conflicts:
debian/changelog
doc/design/assistant/desymlink.mdwn
Diffstat (limited to 'doc/design/assistant/xmpp.mdwn')
| -rw-r--r-- | doc/design/assistant/xmpp.mdwn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index 001b52981..c6d91c5ab 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -11,6 +11,10 @@ who share a repository, that is stored in the [[cloud]]. See <http://git-annex.branchable.com/design/assistant/blog/day_114__xmpp/#comment-aaba579f92cb452caf26ac53071a6788> * Assistant.Sync.manualPull doesn't handle XMPP remotes yet. This is needed to handle getting back in sync after reconnection. +* Support use of a single XMPP account with several separate git-annex repos. + This probably works for the simple push notification use of XMPP. But + XMPP pairing and the pushes over XMPP assume that anyone you're paired with + is intending to sync to your repository. ## design goals |