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

3 files changed, 125 insertions, 0 deletions

diff --git a/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn b/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn
new file mode 100644
index 000000000..8c75cc769
--- /dev/null
+++ b/doc/bugs/could_standalone_copy_of_git_ship__47__deploy_hooks_samples_as_well_as_stock_git__63__.mdwn
@@ -0,0 +1,59 @@
+### Please describe the problem.
+
+ATM, if bundled git is used instead of system-wide available (e.g. standalone git-annex's PATH is preceding system's /usr/bin), then user running 'git init' uses bundled version of git.  In comparison to "full regular" installation of git, bundled version doesn't carry hooks, so any "git init"ed with it repository would lack those samples in .git/hooks
+
+### What steps will reproduce the problem?
+
+just use bundled git and run "git init" in some new dir
+
+### What version of git-annex are you using? On what operating system?
+
+6.20170209+gitg16be7b5cc-1~ndall+1
+
+
+### Please provide any additional information below.
+
+actually there is few more differences (/tmp/123 generated with bundled version) -- description, branches:
+
+[[!format sh """
+(git)hopa:/tmp/123[master]
+$> find .git
+.git
+.git/objects
+.git/objects/info
+.git/objects/pack
+.git/config
+.git/HEAD
+.git/refs
+.git/refs/tags
+.git/refs/heads
+
+(git)hopa:/tmp/123_system[master]
+$> find .git            
+.git
+.git/objects
+.git/objects/info
+.git/objects/pack
+.git/config
+.git/HEAD
+.git/refs
+.git/refs/tags
+.git/refs/heads
+.git/info
+.git/info/exclude
+.git/hooks
+.git/hooks/prepare-commit-msg.sample
+.git/hooks/pre-applypatch.sample
+.git/hooks/pre-rebase.sample
+.git/hooks/pre-receive.sample
+.git/hooks/pre-commit.sample
+.git/hooks/pre-push.sample
+.git/hooks/commit-msg.sample
+.git/hooks/post-update.sample
+.git/hooks/applypatch-msg.sample
+.git/hooks/update.sample
+.git/description
+.git/branches
+"""]]
+
+[[!meta author=yoh]]
diff --git a/doc/bugs/git_annex_info_fails_on_NFS__58___waitToSetLock__58___resource_exhausted___40__No_locks_available__41__/comment_2_4c2e143b8b3283734963e0a6e68755ac._comment b/doc/bugs/git_annex_info_fails_on_NFS__58___waitToSetLock__58___resource_exhausted___40__No_locks_available__41__/comment_2_4c2e143b8b3283734963e0a6e68755ac._comment
new file mode 100644
index 000000000..9fd9af650
--- /dev/null
+++ b/doc/bugs/git_annex_info_fails_on_NFS__58___waitToSetLock__58___resource_exhausted___40__No_locks_available__41__/comment_2_4c2e143b8b3283734963e0a6e68755ac._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="yarikoptic"
+ avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
+ subject="comment 2"
+ date="2017-02-10T01:38:33Z"
+ content="""
+indeed that was the case.... not clear though how that one ended up without pidlock not being set since all creation was uniform as far as I remember
+
+I wonder if annex could potentially detect for such a case and reissue check/assignment of the pidlock?
+"""]]
diff --git a/doc/special_remotes/glacier/comment_14_53c965ab49c75fe2220a04f014ba577f._comment b/doc/special_remotes/glacier/comment_14_53c965ab49c75fe2220a04f014ba577f._comment
new file mode 100644
index 000000000..7345a322e
--- /dev/null
+++ b/doc/special_remotes/glacier/comment_14_53c965ab49c75fe2220a04f014ba577f._comment
@@ -0,0 +1,56 @@
+[[!comment format=mdwn
+ username="victorsavu3@d059e0a74888923e70a555ce8ab75e8ba00b6eb7"
+ nickname="victorsavu3"
+ avatar="http://cdn.libravatar.org/avatar/4b54518265211913a82b83b930427c45"
+ subject="RequestTimeoutException when uploading to glacier"
+ date="2017-02-09T20:45:42Z"
+ content="""
+I sometimes receive the following error when trying to upload files to glacier:
+
+```
+Traceback (most recent call last):
+ File \"/home/victor/bin/glacier\", line 736, in <module>
+    main()
+  File \"/home/victor/bin/glacier\", line 732, in main
+    App().main()
+  File \"/home/victor/bin/glacier\", line 718, in main
+    self.args.func()
+  File \"/home/victor/bin/glacier\", line 500, in archive_upload
+    file_obj=self.args.file, description=name)
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/vault.py\", line 178, in create_archive_from_file
+    writer.close()
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/writer.py\", line 228, in close
+    self.partitioner.flush()
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/writer.py\", line 79, in flush
+    self._send_part()
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/writer.py\", line 75, in _send_part
+    self.send_fn(part)
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/writer.py\", line 222, in _upload_part
+    self.uploader.upload_part(self.next_part_index, part_data)
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/writer.py\", line 129, in upload_part
+    content_range, part_data)
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/layer1.py\", line 1279, in upload_part
+    response_headers=response_headers)
+  File \"/usr/lib/python2.7/site-packages/boto/glacier/layer1.py\", line 119, in make_request
+    raise UnexpectedHTTPResponseError(ok_responses, response)
+boto.glacier.exceptions.UnexpectedHTTPResponseError: Expected 204, got (408, code=RequestTimeoutException, message=Request timed out.)
+gpg: [stdout]: write error: Broken pipe
+gpg: DBG: deflate: iobuf_write failed
+gpg: [stdout]: write error: Broken pipe
+gpg: filter_flush failed on close: Broken pipe
+gpg: [stdout]: write error: Broken pipe
+gpg: filter_flush failed on close: Broken pipe
+git-annex: fd:17: hPutBuf: resource vanished (Broken pipe)
+```
+
+It happens only sometimes. glacier-cli can upload files without problems. The progress of the file upload is also erratic, it jumps to ~90% and then gets stuck. Can I do something to resolve this?
+
+```
+git-annex version: 5.20140717
+build flags: Assistant Inotify DBus TDFA
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
+remote types: git gcrypt bup directory rsync web glacier ddar hook external
+```
+
+I am using glacier-cli from git master.
+"""]]