Commit graph

29277 commits

Author SHA1 Message Date
Joey Hess
e0ab4fe748
response 2016-12-13 12:54:28 -04:00
Joey Hess
6584d875d6
response 2016-12-13 12:53:12 -04:00
Joey Hess
1d82cf39ca
response 2016-12-13 12:48:11 -04:00
Joey Hess
3bf31075ed
comment 2016-12-13 12:43:20 -04:00
Joey Hess
61944ad12c
close 2016-12-13 12:19:44 -04:00
Joey Hess
3b3d6b63e6
Merge branch 'master' of ssh://git-annex.branchable.com 2016-12-13 12:16:18 -04:00
Joey Hess
48d9624a2d
Revert ServerAliveInterval
Revert ServerAliveInterval change in 6.20161111, which caused problems
with too many old versions of ssh and unusual ssh configurations.

It should have not been needed anyway since ssh is supposted to
have TCPKeepAlive enabled by default.
2016-12-13 12:12:38 -04:00
Joey Hess
1d516069d8
close 2016-12-13 12:00:37 -04:00
Joey Hess
11fd49870c
comment 2016-12-13 11:58:56 -04:00
Joey Hess
d87abe61f6
comment 2016-12-13 11:57:32 -04:00
Joey Hess
59fead6da3
Pass annex.web-options to wget and curl after other options, so that eg --no-show-progress can be set by the user to disable the default --show-progress. 2016-12-13 11:56:23 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
b55d5a216d Added a comment 2016-12-13 15:52:35 +00:00
Joey Hess
b0735d098d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-12-13 11:13:58 -04:00
Joey Hess
d9490685fd
metadata --batch: Fix bug when conflicting metadata changes were made in the same batch run.
1 microsecond delay is ugly.. but, maintaining an queue of a list of timestamps
and taking a new one from the queue each time around, or maintaining a timestamp
counter, would probably be slower.
2016-12-13 11:07:49 -04:00
Joey Hess
f01b4cbf7c
analysis 2016-12-13 10:57:11 -04:00
Joey Hess
e08761288d
analysis 2016-12-13 10:49:39 -04:00
Joey Hess
d35d87d8d8
analysis 2016-12-13 10:46:24 -04:00
https://singpolyma.net/
6ff7b0e81b 2016-12-13 02:38:44 +00:00
annexuser
bc3e1b8946 Added a comment 2016-12-13 02:00:08 +00:00
Joey Hess
6f502c859b
todo 2016-12-12 17:21:32 -04:00
Joey Hess
63a49d4df8
comment 2016-12-12 13:31:58 -04:00
Joey Hess
63da8d88bb
Merge branch 'master' of ssh://git-annex.branchable.com 2016-12-12 13:28:50 -04:00
Joey Hess
ce2828a12f
finish fixing android build after tor merge 2016-12-12 13:27:39 -04:00
Joey Hess
a52c011581
Debian: Build webapp on armel. 2016-12-11 21:30:07 -04:00
Joey Hess
bb66e098b1
linux standalone builds should have "unable to decommit memory" bug fixed 2016-12-11 15:37:52 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
c3ab3c6682 2016-12-11 17:46:03 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
8283b1c924 Added a comment: Nope a Fluke 2016-12-11 13:26:29 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
f58b13435e Added a comment: Verification 2016-12-11 00:59:50 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
5fb7b87bf0 Added a comment 2016-12-11 00:26:42 +00:00
Joey Hess
f4b7caaa61
fix some more 2016-12-10 12:29:29 -04:00
Joey Hess
474caa1885
add news item for git-annex 6.20161210 2016-12-10 12:23:34 -04:00
Joey Hess
73a79147b1
releasing package git-annex version 6.20161210 2016-12-10 12:23:18 -04:00
Joey Hess
a88b5e7786
better fix 2016-12-10 12:13:41 -04:00
Joey Hess
dd715b5993
improve hask to work with TH for Free monads 2016-12-10 11:55:56 -04:00
Joey Hess
fd1f127996
warning about old kernels 2016-12-10 11:45:46 -04:00
Joey Hess
b72352e1b1
fix build warning 2016-12-10 11:41:38 -04:00
Joey Hess
effd50d918
fix build with old stm
Old stm lacks isFullTMQueue.

To avoid needing to update stm on the Android autobuilder, I switched to
a TBMQueue. It never needs to be closed, but the overhead is minimal.
2016-12-10 11:32:05 -04:00
Joey Hess
d44694cdd1
followup 2016-12-10 11:31:55 -04:00
Joey Hess
16c6333f09
fix build with old ghc 2016-12-10 11:12:18 -04:00
Joey Hess
c2d9f4397e
fix typo 2016-12-10 11:04:11 -04:00
Joey Hess
749623df86
fixed 2016-12-10 10:47:16 -04:00
Alper Nebi Yasak
93a22a1c97
Remove http-conduit (<2.2.0) constraint
Since https://github.com/aristidb/aws/issues/206 is resolved, this
constraint is no longer necessary. However, http-conduit (>=2.2.0)
requires http-client (>=0.5.0) which introduces some breaking changes.
This commit also implements those changes depending on the version.
Fixes: https://git-annex.branchable.com/bugs/Build_with_aws_head_fails/

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
2016-12-10 10:45:52 -04:00
alpernebbi
bbc5e4f4f3 Added a comment: Patch to fix aws head build issue 2016-12-10 13:08:58 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
efa71e70a4 Added a comment: Corrupt Links Produced, Significant Data Loss 2016-12-10 12:31:32 +00:00
alpernebbi
d07a85e74e Added a comment 2016-12-10 07:36:04 +00:00
Joey Hess
fa1b3a19f9
hang up connection after relaying
Seems that git upload-pack outputs a "ONCDN " that is not read by the
remote git receive-pack. This fixes:

[2016-12-09 17:08:32.77159731] P2P > ERROR protocol parse error: "ONCDN "
2016-12-09 17:11:16 -04:00
Joey Hess
b65780778a
update 2016-12-09 17:07:32 -04:00
Joey Hess
725b8a5e14
fix uuid comparison 2016-12-09 17:02:59 -04:00
Joey Hess
52ccd44812
avoid exposing auth tokens in debug 2016-12-09 16:55:48 -04:00
Joey Hess
e71755abc9
devblog 2016-12-09 16:46:37 -04:00