Matthias Radestock
ad4e4ce6b8
refactor: make 'inner' encoder/decoder explicit
2015-07-20 23:50:10 +01:00
Tom Wilkie
4c9b0be117
Merge pull request #1198 from weaveworks/1146-coverage
...
When running unit tests, output coverage for imported modules.
2015-07-20 20:34:12 +01:00
Tom Wilkie
a9dae46110
When running unit tests, output coverage for imported modules.
2015-07-20 15:47:07 +00:00
Bryan Boreham
e34093c328
Merge pull request #1197 from weaveworks/1158-flaky
...
LGTM
2015-07-20 16:02:52 +01:00
Tom Wilkie
9131b46263
Flush gossip messages after each turn, to ensure there isn't a build up of pending messages.
2015-07-20 14:36:40 +00:00
Michael Bridgen
2a9c3fc64a
Merge branch 'pr1112'
2015-07-20 15:31:42 +01:00
Michael Bridgen
c44c61dc83
Merge branch '1103-proxy-chunking' of github.com:weaveworks/weave into pr1112
2015-07-20 15:09:50 +01:00
Paul Bellamy
11663dd29f
[proxy] rewrote chunked response handler
...
1) We cannot send "Connection: close", because the fsouza docker client
expects the tcp socket to stay open between requests.
2) Because we cannot force-close the connection, we can't hijack the
connection (because go's net/http doesn't let use un-hijack it).
3) Because we need to maintain the individual chunking of messages (for
docker-py), we can't just copy the response body, as Go will remove and
re-add the chunking willy-nilly.
Therefore, we have to read each chunk one-by-one, and flush the
ResponseWriter after each one.
2015-07-20 14:43:16 +01:00
Bryan Boreham
90b7c3625d
Merge pull request #1176 from weaveworks/1156-gossip-timestamp
...
LGTM
2015-07-20 14:28:01 +01:00
Tom Wilkie
4e29dba5cd
Make Gossip DNS reject gossip messages if clockskew > tombstoneTimeout / 2
2015-07-20 13:12:07 +00:00
Matthias Radestock
f1b5a00cb3
Merge pull request #1195 from weaveworks/1177-dns-disappear
...
Don't periodically delete all non-tombstone entries.
Fixes #1177 .
2015-07-20 13:07:42 +01:00
Tom Wilkie
1a4b38a10c
Don't delete all the non-tombstone entries every 10mins!
2015-07-20 12:03:46 +00:00
Tom Wilkie
9ab2da8deb
Add GET /name handler to return all dns entries (including tombstones) for debugging.
...
Also, make Address marshall into json as an IP string, not a number.
2015-07-20 12:03:33 +00:00
Matthias Radestock
66473e6021
refactor: return slice instead of pointer to slice from tombstone()
2015-07-20 12:37:54 +01:00
Paul Bellamy
a9229b9197
weave env should still work with '--log-level=debug'
2015-07-20 11:57:20 +01:00
Paul Bellamy
7b9e59833e
test upload_executable helper should mkdir before uploading
2015-07-20 10:58:39 +01:00
Tom Wilkie
5baddb83cb
Comment out failing test until we figure out what to do.
2015-07-20 09:45:02 +00:00
Tom Wilkie
4e56247ed9
Merge pull request #1193 from weaveworks/disable_dns_in_multiweave
...
Disable dns in multiweave
2015-07-20 10:41:56 +01:00
Matthias Radestock
ae2348875b
disable dns in multiweave
...
Thus unbreaking it post #1065 .
2015-07-19 22:52:42 +01:00
Matthias Radestock
fafaeef07d
introduce --no-dns option
...
undocumented, since it is mainly meant for testing
2015-07-19 22:51:40 +01:00
Matthias Radestock
5b62b8c1e3
refactor: inline populate_dns
...
and ditch the wait_for_status, since we've only just called that
2015-07-19 22:32:33 +01:00
Matthias Radestock
7c17c8aec3
refactor: simplify router arg parsing
...
using the same "always shift one" approach as in proxy_args
2015-07-19 21:56:04 +01:00
Matthias Radestock
64408b126e
weave launch-router wasn't returning the correct container id
...
since $CONTAINER gets stomped on by various functions, in particular
populate_dns.
Broken by #1065 .
2015-07-19 21:50:45 +01:00
Bryan Boreham
2a1f090a88
Merge pull request #1183 from weaveworks/1181-data-race
...
Correctly stop the test gossip router to prevent complaints of data races in subsequent tests.
2015-07-17 17:14:46 +01:00
Matthias Radestock
e2a2a8f18f
Merge branch '1.0'
2015-07-17 15:07:45 +01:00
Matthias Radestock
dafa30725e
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-17 15:07:19 +01:00
Matthias Radestock
24b9a56e0a
Merge pull request #1172 from weaveworks/issues/1061-improve-blockquote
...
Use Boostrap styles for warnings in docs
Fixes #1061 .
2015-07-17 15:06:40 +01:00
Tom Wilkie
a3d32068d2
Correctly stop the test gossip router to prevent complaints of data races in subsequent tests.
2015-07-17 13:48:39 +00:00
David Kaltschmidt
e7f6682593
Use bootstrap alert styles for blockquote
2015-07-17 15:14:29 +02:00
Bryan Boreham
68afbe31b0
Shrink image file size
2015-07-17 14:07:23 +01:00
Tom Wilkie
ba3451e9ca
Merge pull request #1180 from weaveworks/1171-210-failures
...
Don't swallow errors in the docker client.
2015-07-17 13:38:38 +01:00
Tom Wilkie
25c9180fdf
Don't swallow errors in the docker client.
2015-07-17 12:35:12 +00:00
Paul Bellamy
e03a4bb176
updating boot2docker docs from 1.0 to master
2015-07-17 12:55:39 +01:00
Paul Bellamy
4d594458d2
Merge branch '1.0'
2015-07-17 12:47:23 +01:00
Paul Bellamy
38176dcbb6
Merge remote-tracking branch 'upstream/latest_release_doc_updates' into 1.0
2015-07-17 12:46:48 +01:00
Paul Bellamy
854d83f294
updating boot2docker docs for proxy
2015-07-17 12:41:04 +01:00
Matthias Radestock
358ae3a936
Merge pull request #1174 from weaveworks/1128-iprange-error
...
More helpful error message when --ip-alloc-range mismatched
Closes #1128 .
2015-07-17 12:35:20 +01:00
Paul Bellamy
f3131fab57
Merge pull request #1175 from paulbellamy/975-boot2docker-documentation-update
...
updating boot2docker docs for proxy
2015-07-17 12:32:54 +01:00
Paul Bellamy
397f1398ee
updating boot2docker docs for proxy
2015-07-17 12:30:14 +01:00
Bryan Boreham
2dbf83889b
Remove unused error messages
2015-07-17 12:19:54 +01:00
Bryan Boreham
9b2c5b8466
Improve description of merge error
2015-07-17 12:19:33 +01:00
Bryan Boreham
1f4b943454
More helpful error message when --ip-alloc-range mismatched
2015-07-17 11:42:30 +01:00
Matthias Radestock
2ca0fb93c9
Merge pull request #1173 from weaveworks/1168-checkandpanic
...
Make nameserver.checkAndPanic look for dups, call it more often.
Fixes #1168 .
2015-07-17 11:37:34 +01:00
Matthias Radestock
47273d424f
Merge pull request #1170 from weaveworks/exec-dockerfile
...
Re-arrange weaveexec Dockerfile to improve download times
2015-07-17 11:36:15 +01:00
Bryan Boreham
f4d6e028d4
Simplify
2015-07-17 11:33:29 +01:00
Tom Wilkie
f10e0e4add
Merge pull request #1159 from weaveworks/1150-claim-from-peer
...
Implement claiming addresses from other peers
2015-07-17 11:21:48 +01:00
Tom Wilkie
66e58937ca
Make nameserver.checkAndPanic look for dups, call it more often.
2015-07-17 10:19:25 +00:00
Matthias Radestock
62c1cad676
Merge remote-tracking branch 'upstream/master'
2015-07-17 10:58:34 +01:00
Matthias Radestock
ca523c716c
cosmetic
2015-07-17 10:58:01 +01:00
Tom Wilkie
e2deff09a6
Nameserver: log when peer goes away.
2015-07-17 09:36:44 +00:00
Matthias Radestock