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

This commit is contained in:
Joey Hess 2012-09-02 20:44:34 -04:00
commit 1f8a0bd4f6
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.236"
subject="comment 2"
date="2012-09-02T21:40:17Z"
content="""
@tobias, when you say \"gpg being stupid\", what exactly do you see at that point? Please paste it.
"""]]

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0"
nickname="Tobias"
subject="comment 3"
date="2012-09-02T23:49:17Z"
content="""
Updated to the latest trunk, and did some more testing.
I'll retract the \"gpg being stupid\" comment. it just gives the normal \"(gpg)\".
There really isn't anything interesting in the stdout(but a lot of defunct git's in ps auxw), but i still can't get any files larger than ~710kbyte to transfer. They just stall.
http://pastebin.com/ZA8dzxZD <- stdout/stderr
http://pastebin.com/f1J1T79E <- ps auxw | grep git
"""]]