aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-12 10:43:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-12 10:43:50 -0400
commit6a2fe06e5bdd8f945105f3b8f1dc889c415e7268 (patch)
tree27a46d867b1569e242de12c2e43a81243c3eefce
parente3f25639a449ffba86cc870f5e9fea6d6d53d501 (diff)
parent7c4da1db18eee26bbcfbf52daa0f9da7b0af8fdb (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/design/assistant/blog/day_128__last_xmpp_day/comment_6_2f9ba367e19d77bf52f372b6f0f5938a._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/design/assistant/blog/day_128__last_xmpp_day/comment_6_2f9ba367e19d77bf52f372b6f0f5938a._comment b/doc/design/assistant/blog/day_128__last_xmpp_day/comment_6_2f9ba367e19d77bf52f372b6f0f5938a._comment
new file mode 100644
index 000000000..e73c4c071
--- /dev/null
+++ b/doc/design/assistant/blog/day_128__last_xmpp_day/comment_6_2f9ba367e19d77bf52f372b6f0f5938a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.108.27"
+ subject="comment 6"
+ date="2012-11-12T14:43:32Z"
+ content="""
+For local pairing, multicast UDP is used for discovery and authentication, and then all data transfers take place over ssh.
+"""]]