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

This commit is contained in:
Joey Hess 2012-11-29 17:01:35 -04:00
commit 1536fa6f4b
7 changed files with 94 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 11"
date="2012-11-29T19:55:17Z"
content="""
I've dealt with these ssh issues by including ssh in the app bundle.
OTOH, I don't know how `git config --null --list` could possibly take any appreciable amount of CPU to run.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 1"
date="2012-11-29T20:13:53Z"
content="""
Hmm, is this an encrypted rsync remote?
I have not been able to reproduce the problem so fat.
If you start the assistant with --debug, and look in .git/annex/daemon.log, you should find where it runs gpg, and the lines showing what it's doing just before/after that should provide a hint what it's doing.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://grossmeier.net/"
nickname="greg"
subject="comment 2"
date="2012-11-29T19:55:25Z"
content="""
Thanks, Joey. I've reported it [downstream in LP](https://bugs.launchpad.net/ubuntu/+source/git-annex/+bug/1084693).
"""]]