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

This commit is contained in:
Joey Hess 2013-07-20 21:19:27 -04:00
commit d3d2b0efad
2 changed files with 35 additions and 0 deletions

View file

@ -0,0 +1,27 @@
I cannot get the assistant to connect to my jabber account, db48x@db48x.net. I get the message stating that it may take a minute, which is never updated. At the very least I would expect some sort of error message.
I get the same symptoms if I connect to an account @gmail.com, but type in the wrong password. If I put in the correct password, it connects quite quickly.
### What version of git-annex are you using? On what operating system?
[[!format txt """
[db48x@celebdil ~]$ git annex version
git-annex version: 4.20130709
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
[db48x@celebdil ~]$ uname -a
Linux celebdil 3.9.9-201.fc18.x86_64 #1 SMP Fri Jul 5 16:42:02 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux
"""]]
(Fedora 18)
I get exactly the same behavior on my phone, which is running Android 4.1.2
### Please provide any additional information below.
[[!format txt """
[db48x@celebdil books]$ cat .git/annex/daemon.log
[2013-07-20 16:21:28 PDT] main: starting assistant version 4.20130709
(scanning...) [2013-07-20 16:21:28 PDT] Watcher: Performing startup scan
(started...)
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 11"
date="2013-07-21T00:25:04Z"
content="""
I've updated the linux daily builds with this bug fix, so if you want to you can get the new standalone tarball and use that.
"""]]