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

10 files changed, 95 insertions, 1 deletions

diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_4_7009b6727ba40bc9bd1b1f939e75d093._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_4_7009b6727ba40bc9bd1b1f939e75d093._comment
new file mode 100644
index 000000000..eba3baedc
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_4_7009b6727ba40bc9bd1b1f939e75d093._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 4"
+ date="2013-05-30T19:18:50Z"
+ content="""
+Seems it's crashing while trying to print out a message telling you to use the menu to open the webapp. I'm not sure why, but I have updated the android autobuild to try to work around this. If you can test and tell me if that fixes it or not, it'll help me tell what's going on.
+"""]]
diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_5_00ddf7ade6cca758afa838be0b9588cb._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_5_00ddf7ade6cca758afa838be0b9588cb._comment
new file mode 100644
index 000000000..04de2d3de
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_5_00ddf7ade6cca758afa838be0b9588cb._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM"
+ nickname="Bruno"
+ subject="comment 5"
+ date="2013-05-30T19:38:59Z"
+ content="""
+I still have the problem :(
+
+    [2013-05-30 15:36:31 EDT] main: starting assistant version 4.20130530-g2e0f464
+    Already up-to-date.
+    WebApp crashed: <file descriptor: 14>: hPutStr: illegal operation (handle is closed)
+    [2013-05-30 15:36:32 EDT] WebApp: warning WebApp crashed: <file descriptor: 14>: hPutStr: illegal operation (handle is closed)
+
+    (scanning...) [2013-05-30 15:36:32 EDT] Watcher: Performing startup scan
+    Already up-to-date.
+    [2013-05-30 15:36:35 EDT] Committer: Committing changes to git
+
+    (Recording state in git...)
+    (started...) [2013-05-30 15:36:44 EDT] Committer: Committing changes to git
+"""]]
diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_6_6137ef0ad01d5600dab6fccbeed9a88b._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_6_6137ef0ad01d5600dab6fccbeed9a88b._comment
new file mode 100644
index 000000000..79606cb09
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_6_6137ef0ad01d5600dab6fccbeed9a88b._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 6"
+ date="2013-05-30T19:45:30Z"
+ content="""
+Changed to fd 14 and not 15, so my change to use the dupped stdout did take effect.
+
+Interesting. Either dup() is just failing (silently!), or the `am` command is somehow closing the assistant's fds (not sure if that's possible).
+
+In either case, it's only happening on your device, not on mine.
+
+I suppose this will just need to wait until I sort out better the opening of the webapp on android. The \"crash\" does not seem like it will affect the actual functioning of the webapp.
+"""]]
diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_7_4b79d7ea338d9f70eb80b8cc2c5a21e4._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_7_4b79d7ea338d9f70eb80b8cc2c5a21e4._comment
new file mode 100644
index 000000000..03fe1cf8b
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_7_4b79d7ea338d9f70eb80b8cc2c5a21e4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 7"
+ date="2013-05-30T19:48:14Z"
+ content="""
+Actually, the dupped stdout is open and working before `am` is run, so `am` must somehow be messing with it. Can't be a dupping problem. Need to stop using this `am` nonsense clearly.
+"""]]
diff --git a/doc/forum/glacier_-_range_retrievals_and_daily_free_retrieval_allowance.mdwn b/doc/forum/glacier_-_range_retrievals_and_daily_free_retrieval_allowance.mdwn
new file mode 100644
index 000000000..d9db436c6
--- /dev/null
+++ b/doc/forum/glacier_-_range_retrievals_and_daily_free_retrieval_allowance.mdwn
@@ -0,0 +1,6 @@
+I propose to add some functionality to git-annex, to automatically "throttle" the data retrieval from amazon glacier to stay within the daily free retrieval allowance. If someone would need to get his/her files faster, there should be an option to disable this throttling (or even better, specify the retrieval rate).
+
+As far as I understand glacier, this could be implemented using range retrievals. In short range retrievals enable you, to only retrieve a part of an archive in glacier. This can be used to only retrieve / request so much data, that you stay within the free retrieval allowance. ( please see [Q: Why would I retrieve only a range of an archive?](http://aws.amazon.com/glacier/faqs/#Why_would_I_retrieve_only_a_range_of_an_archive) ).
+
+
+This would be somewhat similar to the [smart retrieval feature in cloudberry](http://blog.cloudberrylab.com/2012/12/introducing-smart-restore-for-amazon.html) .
diff --git a/doc/install/Debian/comment_10_d5da996e106d2e4d8a822aa9bcc78596._comment b/doc/install/Debian/comment_10_d5da996e106d2e4d8a822aa9bcc78596._comment
new file mode 100644
index 000000000..a03038dc8
--- /dev/null
+++ b/doc/install/Debian/comment_10_d5da996e106d2e4d8a822aa9bcc78596._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 10"
+ date="2013-05-30T19:42:05Z"
+ content="""
+As of today, I have backported everything except for haskell-lens, haskell-dav, and haskell-network-protocol-xmpp. The last is the only real blocker (I can build a backport without webdav support..). 
+
+The haskell-network-protocol-xmpp in stable is actually ok, except it needs to be rebuilt against the haskell-gnutls I uploaded today. This fixes a bad segfault bug. I don't know how to handle this situation in backports TBH, and so am stuck waiting for a newer version of haskell-network-protocol-xmpp to reach testing, to get around backport's requirements that the backport version be in testing.
+
+In other words, it'll happen in 2 to 5 weeks, probably..
+"""]]
diff --git a/doc/install/Debian/comment_11_84283676da247c401bc9b4bb12c2b453._comment b/doc/install/Debian/comment_11_84283676da247c401bc9b4bb12c2b453._comment
new file mode 100644
index 000000000..4507f36db
--- /dev/null
+++ b/doc/install/Debian/comment_11_84283676da247c401bc9b4bb12c2b453._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://hands.com/~phil/"
+ nickname="hands"
+ subject="comment 11"
+ date="2013-05-30T19:56:07Z"
+ content="""
+Fair enough -- that's more positive than I was expecting TBH -- Thanks Joey :-)
+"""]]
diff --git a/doc/install/Debian/comment_9_97eaed998ffd1ed79585075ed5cff06e._comment b/doc/install/Debian/comment_9_97eaed998ffd1ed79585075ed5cff06e._comment
new file mode 100644
index 000000000..d58f294b6
--- /dev/null
+++ b/doc/install/Debian/comment_9_97eaed998ffd1ed79585075ed5cff06e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://hands.com/~phil/"
+ nickname="hands"
+ subject="any chance of a wheezy-backports upload?"
+ date="2013-05-30T18:43:52Z"
+ content="""
+I note that the instructions at the top of the page suggest that one can install the unstable version into wheezy, but as mentioned by [mey.vn](#comment-f9811cbd46471d4159d09d814ac9cf15) this is not the case with 4.20130521 (on amd64 at least) because of the libc6 version dependency.  That being the case, it would be really nice to see this in wheezy-backports as well, or would that require backporting a huge pile of haskell as well? (in which case I can see why you're not keen).
+"""]]
diff --git a/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__.mdwn b/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__.mdwn
index 224f3a3fe..c32eb966f 100644
--- a/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__.mdwn
+++ b/doc/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__.mdwn
@@ -16,7 +16,7 @@ There appears to currently be two methods:
 
 ##Start off with a clean wheezy chroot
 
-    sudo debootstrap weezy debian-wheezy
+    sudo debootstrap wheezy debian-wheezy
     sudo chroot debian-wheezy
 
 ##Install some build tools
diff --git a/doc/walkthrough/modifying_annexed_files/comment_2_b000622304535d32b69db17d51156b21._comment b/doc/walkthrough/modifying_annexed_files/comment_2_b000622304535d32b69db17d51156b21._comment
new file mode 100644
index 000000000..6a2d2c2a6
--- /dev/null
+++ b/doc/walkthrough/modifying_annexed_files/comment_2_b000622304535d32b69db17d51156b21._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://yarikoptic.myopenid.com/"
+ nickname="site-myopenid"
+ subject="feature request: unlock --drop"
+ date="2013-05-30T20:26:52Z"
+ content="""
+ATM unlock copies original file for modifications, so that original copy remains under annex and possibly to-be-edited copy created.
+But if I am \"unlock\"ing file I might simply not be interested in a previous copy and want to maintain only a single (possibly edited) new copy.
+What if there was a mode where the actual file is simply moved into \"unlocked\" location for editing, thus effectively dropping the actual content from git annex.  That would allow to not inquire lengthy copying/wasting local space.  If then I would need a previous copy I would just \"get\" it again.
+"""]]