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

7 files changed, 140 insertions, 0 deletions

diff --git a/doc/bugs/Box.com_ReposnseTimeout.mdwn b/doc/bugs/Box.com_ReposnseTimeout.mdwn
new file mode 100644
index 000000000..bb8208b46
--- /dev/null
+++ b/doc/bugs/Box.com_ReposnseTimeout.mdwn
@@ -0,0 +1,10 @@
+Box.com is still not working properly in version 5.20140227 (I'm using it in Debian testing and sid).
+
+I created a new clean repository and configured Box.com (everything from the webapp). At first it seamed to work, files where being uploaded and the logs where fine. Then I created another clean repository in another computer and started syncing. Downloading files worked properly, but when trying to upload a file from the second computer I got this:
+
+    copy my_file (gpg) (checking box.com...) (to box.com...) 
+    100%          0.0 B/s 0sResponseTimeout
+    failed                  
+    git-annex: copy: 1 failed
+
+When I got back to the first computer I saw the same behavior, uploading files wasn't working any more.
diff --git a/doc/bugs/Box.com_ReposnseTimeout/comment_1_4ac0bf61fb4b2ac335a8a1f29e9d882d._comment b/doc/bugs/Box.com_ReposnseTimeout/comment_1_4ac0bf61fb4b2ac335a8a1f29e9d882d._comment
new file mode 100644
index 000000000..062fbfac6
--- /dev/null
+++ b/doc/bugs/Box.com_ReposnseTimeout/comment_1_4ac0bf61fb4b2ac335a8a1f29e9d882d._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8"
+ nickname="Jon Ander"
+ subject="comment 1"
+ date="2014-03-01T11:23:05Z"
+ content="""
+I have another error log:
+
+    29%      653.2KB/s 1m49sgpg: [stdout]: write error: Broken pipe
+    gpg: DBG: deflate: iobuf_write failed
+    gpg: build_packet failed: file write error
+    gpg: [stdout]: write error: Broken pipe
+    gpg: iobuf_flush failed on close: file write error
+    gpg: symmetric encryption of `[stdin]' failed: file write error
+    ResponseTimeout
+    git-annex: fd:96: hPutBuf: resource vanished (Broken pipe)
+    ResponseTimeout
+
+Some files (very few) are being uploaded properly, so the error is not always reproducible.
+"""]]
diff --git a/doc/bugs/assistant_eats_all_CPU/comment_19_2b8241800ae265260506ac9c73cca209._comment b/doc/bugs/assistant_eats_all_CPU/comment_19_2b8241800ae265260506ac9c73cca209._comment
new file mode 100644
index 000000000..9c39baad2
--- /dev/null
+++ b/doc/bugs/assistant_eats_all_CPU/comment_19_2b8241800ae265260506ac9c73cca209._comment
@@ -0,0 +1,56 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY"
+ nickname="Thomas"
+ subject="XMPP something to do with it?"
+ date="2014-03-02T13:48:22Z"
+ content="""
+High (between 30 and 100%) processor load in my case seems to be related to lots of these logfile entries:
+
+    [2014-03-02 14:36:54 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 75 \"<elided>\")
+    [2014-03-02 14:36:54 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:54 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 76 \"<elided>\")
+    [2014-03-02 14:36:54 CET] XMPPClient: received: [\"Ignorable Presence from s6/941d024438f7cd11 Just (Element {elementName = Name {nameLocalName = \\"git-annex\\", nameNamespace = Just \\"git-annex\\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})\"]
+    [2014-03-02 14:36:54 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:54 CET] XMPPClient: received: [\"Pushing \\"s34\\" (CanPush (UUID \\"005cc6c3-a4de-44d5-847e-58b5bc4e4c26\\") [Ref \\"d39375b2da76a05c13a8fdc2197a58af0a9812fc\\",Ref \\"5c0108dcad557ab48bfe335e533f13f29777ca7b\\"])\"]
+    [2014-03-02 14:36:54 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 77 \"<elided>\")
+    [2014-03-02 14:36:54 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:54 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 78 \"<elided>\")
+    [2014-03-02 14:36:54 CET] XMPPClient: to client: s6/a303a6cfb26b8e08    
+    [2014-03-02 14:36:55 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 79 \"<elided>\")
+    [2014-03-02 14:36:55 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:55 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 80 \"<elided>\")
+    [2014-03-02 14:36:55 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:55 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 81 \"<elided>\")
+    [2014-03-02 14:36:55 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:55 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 82 \"<elided>\")
+    [2014-03-02 14:36:55 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:56 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 83 \"<elided>\")
+    [2014-03-02 14:36:56 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:56 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 84 \"<elided>\")
+    [2014-03-02 14:36:56 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:56 CET] XMPPClient: received: [\"Presence from s6/a303a6cfb26b8e08 Just (Element {elementName = Name {nameLocalName = \\"git-annex\\", nameNamespace = Just \\"git-annex\\", namePrefix = Nothing}, elementAttributes = [(Name {nameLocalName = \\"query\\", nameNamespace = Nothing, namePrefix = Nothing},[ContentText \\"\\"])], elementNodes = []})\",\"QueryPresence\"]
+    [2014-03-02 14:36:56 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 85 \"<elided>\")
+    [2014-03-02 14:36:56 CET] XMPPClient: received: [\"Pushing \\"s34\\" (CanPush (UUID \\"005cc6c3-a4de-44d5-847e-58b5bc4e4c26\\") [Ref \\"d39375b2da76a05c13a8fdc2197a58af0a9812fc\\",Ref \\"f43c777aed404e1e98dcbf9b6499f4d056b6662a\\"])\"]
+    [2014-03-02 14:36:56 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:56 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 86 \"<elided>\")
+    [2014-03-02 14:36:56 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:57 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 87 \"<elided>\")
+    [2014-03-02 14:36:57 CET] XMPPClient: received: [\"Ignorable Presence from s6/941d024438f7cd11 Just (Element {elementName = Name {nameLocalName = \\"git-annex\\", nameNamespace = Just \\"git-annex\\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})\"]
+    [2014-03-02 14:36:57 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:57 CET] XMPPClient: received: [\"Pushing \\"s34\\" (CanPush (UUID \\"005cc6c3-a4de-44d5-847e-58b5bc4e4c26\\") [Ref \\"d39375b2da76a05c13a8fdc2197a58af0a9812fc\\",Ref \\"f43c777aed404e1e98dcbf9b6499f4d056b6662a\\"])\"]
+    [2014-03-02 14:36:57 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 88 \"<elided>\")
+    [2014-03-02 14:36:57 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:57 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 89 \"<elided>\")
+    [2014-03-02 14:36:57 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+    [2014-03-02 14:36:57 CET] XMPPClient: sending: Pushing \"s34\" (SendPackOutput 90 \"<elided>\")
+    [2014-03-02 14:36:57 CET] XMPPClient: to client: s6/a303a6cfb26b8e08
+
+This is after everything is uploaded to a ssh server (in the cloud, used for transfer) and while another computer is downloading from there (?).
+
+git-annex version: 5.20140227
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+
+Debian testing using jabber.org for xmpp
+"""]]
diff --git a/doc/bugs/assistant_eats_all_CPU/comment_20_1d9020679d66e6b4742df067cb9da4f1._comment b/doc/bugs/assistant_eats_all_CPU/comment_20_1d9020679d66e6b4742df067cb9da4f1._comment
new file mode 100644
index 000000000..c228560f2
--- /dev/null
+++ b/doc/bugs/assistant_eats_all_CPU/comment_20_1d9020679d66e6b4742df067cb9da4f1._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="2001:1928:1:9::1"
+ subject="comment 20"
+ date="2014-03-02T16:33:57Z"
+ content="""
+This is still a problem in Debian jessie and version `5.20140210` from the debian packages.
+
+"""]]
diff --git a/doc/forum/Too_big_to_fsck/comment_4_19ef90803aa7ce158bce02378e18ea0f._comment b/doc/forum/Too_big_to_fsck/comment_4_19ef90803aa7ce158bce02378e18ea0f._comment
new file mode 100644
index 000000000..69774073d
--- /dev/null
+++ b/doc/forum/Too_big_to_fsck/comment_4_19ef90803aa7ce158bce02378e18ea0f._comment
@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o"
+ nickname="Aaron"
+ subject="Didn't work"
+ date="2014-03-01T22:40:36Z"
+ content="""
+Many thanks for your input, Joey.
+
+That didn't seem to work.
+
+$ git fsck --no-dangling --no-reflogs |wc
+error: unknown option `no-dangling'
+usage: git fsck [options] [<object>...]
+
+    -v, --verbose         be verbose
+    --unreachable         show unreachable objects
+    --tags                report tags
+    --root                report root nodes
+    --cache               make index objects head nodes
+    --reflogs             make reflogs head nodes (default)
+    --full                also consider packs and alternate objects
+    --strict              enable more strict checking
+    --lost-found          write dangling objects in .git/lost-found
+    --progress            show progress
+
+      0       0       0
+
+$ git --version
+git version 1.7.9.5
+"""]]
diff --git a/doc/forum/new_linux_arm_tarball_build/comment_9_2802b24ccb24f1615c9d61904f916d05._comment b/doc/forum/new_linux_arm_tarball_build/comment_9_2802b24ccb24f1615c9d61904f916d05._comment
new file mode 100644
index 000000000..fbb0e2f21
--- /dev/null
+++ b/doc/forum/new_linux_arm_tarball_build/comment_9_2802b24ccb24f1615c9d61904f916d05._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c"
+ nickname="Justin"
+ subject="comment 9"
+ date="2014-03-01T19:13:16Z"
+ content="""
+This seems to work great for me on Raspbian, except I get many errors of the form
+
+    ERROR: ld.so: object '/usr/lib/arm-linux-gnueabihf/libcofi_rpi.so' from /etc/ld.so.preload cannot be preloaded: ignored.
+
+I've tried, but I haven't been able to figure out why ld doesn't like this particular lib.  I can keep ignoring the error, but help would certainly be appreciated!
+"""]]
diff --git a/doc/todo/custom_f-droid_repo.mdwn b/doc/todo/custom_f-droid_repo.mdwn
new file mode 100644
index 000000000..d4ec3e1f3
--- /dev/null
+++ b/doc/todo/custom_f-droid_repo.mdwn
@@ -0,0 +1,3 @@
+It would be great to have a custom f-droid repo "alla guardianproject.info" (before getting git-annex into the main f-droid repo).
+
+See https://github.com/guardianproject/fdroid-repo (https://guardianproject.info/repo/).