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

2 files changed, 57 insertions, 0 deletions

diff --git a/doc/bugs/Daemon_stops_working_on_mounted_CIF_share/comment_1_2a5fb522cbf6e2cefbee0a5fc48287d0._comment b/doc/bugs/Daemon_stops_working_on_mounted_CIF_share/comment_1_2a5fb522cbf6e2cefbee0a5fc48287d0._comment
new file mode 100644
index 000000000..d247667c4
--- /dev/null
+++ b/doc/bugs/Daemon_stops_working_on_mounted_CIF_share/comment_1_2a5fb522cbf6e2cefbee0a5fc48287d0._comment
@@ -0,0 +1,45 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co"
+ nickname="VS7"
+ subject="comment 1"
+ date="2014-05-21T07:17:44Z"
+ content="""
+[[!format sh \"\"\"
+[filesync@ServiceVM00001 manuals]$ ps aux | grep assistant
+filesync 27036  0.0  0.0 103244   864 pts/0    S+   11:13   0:00 grep assistant
+\"\"\"]]
+[[!format sh \"\"\"
+[filesync@ServiceVM00001 manuals]$ git annex assistant
+\"\"\"]]
+[[!format sh \"\"\"
+[filesync@ServiceVM00001 manuals]$ cat .git/annex/daemon.log
+[2014-05-21 11:14:06 MSK] main: starting assistant version 5.20140421-g515d251
+[2014-05-21 11:14:07 MSK] Cronner: You should enable consistency checking to protect your data.
+failed to add watch on directory /home/filesync/.config/git-annex (/home/filesync/.config/git-annex: getDirectoryContents: does not exist (No such file or directory))
+
+  dbus failed; falling back to mtab polling (ClientError {clientErrorMessage = \"runClient: unable to determine DBUS address\", clientErrorFatal = True})
+p11-kit: couldn't load module: /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so: /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so: cannot open shared object file: No such file or directory
+
+  No known network monitor available through dbus; falling back to polling
+[2014-05-21 11:14:09 MSK] Upgrader: An upgrade of git-annex is available.  (version 5.20140517)
+
+Already up-to-date.
+(scanning...) [2014-05-21 11:14:09 MSK] Watcher: Performing startup scan
+\"\"\"]]
+[[!format sh \"\"\"
+[filesync@ServiceVM00001 manuals]$ git annex assistant --stop
+
+git-annex: /home/filesync/manuals/.git/annex/daemon.pid: hGetContents: permission denied (Permission denied)
+failed
+git-annex: assistant: 1 failed
+\"\"\"]]
+[[!format sh \"\"\"
+[filesync@ServiceVM00001 manuals]$ cat .git/annex/daemon.pid
+cat: .git/annex/daemon.pid: Permission denied
+\"\"\"]]
+[[!format sh \"\"\"
+[filesync@ServiceVM00001 manuals]$ ps aux | grep assistant
+filesync 27060  6.2  0.5 566372 41808 ?        Sl   11:14   0:04 /home/filesync/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /home/filesync/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/home/filesync/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/home/filesync/git-annex.linux//etc/ld.so.conf.d:/home/filesync/git-annex.linux//usr/lib:/home/filesync/git-annex.linux//usr/lib/x86_64-linux-gnu:/home/filesync/git-annex.linux//lib64:/home/filesync/git-annex.linux//lib/x86_64-linux-gnu: /home/filesync/git-annex.linux/shimmed/git-annex/git-annex assistant
+filesync 27115  0.0  0.0 103244   864 pts/0    S+   11:15   0:00 grep assistant
+\"\"\"]]
+"""]]
diff --git a/doc/special_remotes/webdav/comment_14_2390020fa7daac8a6d3e8b713bd3b8e7._comment b/doc/special_remotes/webdav/comment_14_2390020fa7daac8a6d3e8b713bd3b8e7._comment
new file mode 100644
index 000000000..b6f624a62
--- /dev/null
+++ b/doc/special_remotes/webdav/comment_14_2390020fa7daac8a6d3e8b713bd3b8e7._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8"
+ nickname="Maarten"
+ subject="Box.com and unknown CA?"
+ date="2014-05-21T04:07:36Z"
+ content="""
+When trying to enable box.com for jabber sharing, I get:
+
+    WebDAV failed to write file: TlsException (HandshakeFailed (Error_Protocol (\"certificate has unknown CA\",True,UnknownCa))): user error
+
+How can I debug this situation?
+"""]]