mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2012-10-24 10:55:35 -04:00
commit c396b9f542
4 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/design/assistant/blog/day_112__and_now_for_something_completely_different/comment_1_5e4fe1538d9ae1c450b0a6602fc6d29b._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmQ4Oe5-qOANRuZel9kDvtBfQG1zlEcIzw"
nickname="Dominik"
subject="PEP is ok"
date="2012-10-24T05:15:38Z"
content="""
PEP and pubsub are really widely used. You will have a hard time finding a server that doesn't support it.
Also note XMPPs ability to send status to only selected buddies and even resources. You can globally appear as offline while sending availability to myownjid@example.com/thatannexthere.
"""]]

8
doc/design/assistant/blog/day_112__and_now_for_something_completely_different/comment_2_c5a734f611ecc95729904e645583ee43._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmQ4Oe5-qOANRuZel9kDvtBfQG1zlEcIzw"
nickname="Dominik"
subject="Remote control clients"
date="2012-10-24T05:18:02Z"
content="""
Then of course there is XEP-0146, which has some advantages to it, like controlling annex from the context menu of another Jabber client.
"""]]

8
doc/forum/shared_cipher_tries_to_use_gpg/comment_2_f3260aea3a5bb9b95a9bdf1d0dfce090._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU"
nickname="lee"
subject="A little too old"
date="2012-10-23T20:47:40Z"
content="""
That's the problem, then. I have 3.20120406. For my purposes a gpg key with no passphrase works, though. Thanks.
"""]]

12
doc/special_remotes/bup/comment_2_612b038c15206f9f3c2e23c7104ca627._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.23"
subject="comment 2"
date="2012-10-23T20:01:43Z"
content="""
@Albert, thanks for reporting this bug (but put them in [[bugs]] in future please).
This is specific to using the bup special remote with encryption. Without encryption it works. And no, it won't manage to deduplicate anything that's encrypted, as far as I know.
I think bup-split must have used - for stdin in the past, but now, it just reads from stdin when no file is specified, so I've updated git-annex.
"""]]