Tom Wilkie
da36c78942
Reduce the number of times gcs.sh ssh's into the VMs
2015-07-29 09:41:57 +00:00
Matthias Radestock
77358140d9
Merge pull request #1219 from squaremo/driveby
...
Remove misleading comment and lowercase deniedBy
2015-07-28 18:09:01 +01:00
Adam Harrison
1701bc3e92
Merge branch '1.0'
...
Conflicts:
weave
2015-07-28 18:06:44 +01:00
Matthias Radestock
ba0ffd225e
Merge pull request #1231 from weaveworks/issues/1229-explicitly-set-docker-bridge-mac
...
Enforce docker bridge address assignment type on launch
Fixes #1229 .
2015-07-28 17:59:46 +01:00
Adam Harrison
a14d4d9f8e
Enforce docker bridge address assignment type on launch
2015-07-28 17:51:48 +01:00
Paul Bellamy
792c4c8de4
Merge pull request #1227 from weaveworks/gce-gc
...
Extend scheduler to periodically garbage collect stranded VMs
2015-07-28 15:35:28 +01:00
Matthias Radestock
820307dd4e
Merge pull request #1228 from weaveworks/1030-150-connect-forget
...
Don't init the ring if the address is not in range.
Fixes #1030 .
2015-07-28 15:29:16 +01:00
Tom Wilkie
88144ac7f8
Review feedback
2015-07-28 14:16:38 +00:00
Tom Wilkie
da7ac78694
Don't try and init the ring if the IP address is not in our range.
2015-07-28 14:12:42 +00:00
Tom Wilkie
10dbd9ad4c
Merge pull request #1224 from weaveworks/1203_proper_mock_gossip
...
proper mock periodic gossip
2015-07-28 13:29:20 +01:00
Tom Wilkie
9779e06f66
Extend scheduler to periodically garbage collect stranded VMs
2015-07-28 13:19:38 +01:00
Matthias Radestock
f861d22593
do proper mock periodic gossip
...
instead of abusing broadcast gossip
Fixes #1203 .
2015-07-28 10:37:18 +01:00
Paul Bellamy
e3f0565517
Merge pull request #1221 from weaveworks/1220_include_test_dir_coverage
...
include directory of test code in coverage
2015-07-28 10:05:16 +01:00
Matthias Radestock
9a91b3ce9c
include directory of test code in coverage
...
Fixes #1220 .
2015-07-27 17:08:31 +01:00
Michael Bridgen
c88361473c
Remove misleading comment and lowercase deniedBy
...
* the comment "don't make the caller wait" applies to both branches
of that if clause, and having it on one branch implies the other
does make the caller wait
* there's no reason for DeniedBy to start with a capital: it's a
method on a private struct and it's not part of an interface.
2015-07-27 16:22:32 +01:00
Michael Bridgen
a2e1a2d375
Merge branch 'pr1200'
2015-07-27 15:46:29 +01:00
Matthias Radestock
536ce992fc
re-enable test
...
our switch on CircleCI from Docker 1.7.0 to 1.7.1 should make this
pass now.
2015-07-27 14:47:55 +01:00
Matthias Radestock
ce37b622eb
Merge branch '1.0'
2015-07-27 14:25:06 +01:00
Matthias Radestock
d5e510f778
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-27 14:24:33 +01:00
Matthias Radestock
be8e414d5a
Merge pull request #1217 from weaveworks/1186_document_root_docker
...
document how to run weave when docker access is root-only
Closes #1186 .
2015-07-27 14:23:50 +01:00
Matthias Radestock
65e94f624b
document how to run weave when docker access is root-only
...
Closes #1186 .
2015-07-27 14:13:50 +01:00
Paul Bellamy
ed4fb14f52
Merge pull request #1214 from weaveworks/rebuild-gce-templates
...
[circle] use new gce templates for docker 1.7.1
2015-07-27 13:38:44 +01:00
Paul Bellamy
34bb7ae84a
[circle] use new gce templates for docker 1.7.1
2015-07-27 12:51:12 +01:00
Michael Bridgen
5389e31190
Merge branch '687-detect-ipam-clash' of github.com:weaveworks/weave into pr1200
2015-07-27 11:54:31 +01:00
Bryan Boreham
f0915221d1
Rename 'reclaim' to 'noErrorUnknown' which describes the behaviour better
2015-07-23 20:16:30 +01:00
Matthias Radestock
aa4efd63ef
cosmetic: uncomment test the way ordained by emacs
2015-07-22 16:55:43 +01:00
Tom Wilkie
a12d63bb12
Make ipam test less stressful, so it doesn't timeout.
2015-07-22 12:53:27 +00:00
Tom Wilkie
062a25a032
Make unit test timeout 8mins.
2015-07-22 12:19:12 +00:00
Tom Wilkie
9e6d08c606
Put 2m timeout on all unit tests.
2015-07-22 11:56:39 +00:00
Alvaro
976641c3b6
Reverted: Fixed typo
2015-07-22 12:17:29 +02:00
Alvaro
2f80f12001
Fixed typo
2015-07-22 12:14:38 +02:00
Bryan Boreham
647b755b64
Check manually-assigned addresses with IPAM to see if they clash
2015-07-21 17:02:52 +01:00
David Wragg
26dc83dbc2
Merge weaveworks/519_remove_outermost_gob (PR #1189 )
2015-07-21 12:01:40 +01:00
Matthias Radestock
3c107d675a
Merge branch '1.0'
2015-07-21 11:42:49 +01:00
Matthias Radestock
a20ca49344
Merge pull request #1206 from weaveworks/1201-weavewait-ro
...
[proxy] Mount weavewait readonly so it can't be tampered with
Fixes #1201 .
2015-07-21 11:41:48 +01:00
Paul Bellamy
aa8466f688
[proxy] Mount weavewait readonly so it can't be tampered with
2015-07-21 11:30:56 +01:00
Tom Wilkie
2980586e76
Put timeout on nameserver test to try and expose #1203
2015-07-21 09:25:04 +00:00
Paul Bellamy
dba116bae1
Merge remote-tracking branch 'upstream/1.0'
2015-07-21 10:13:24 +01:00
Matthias Radestock
0b7d462adf
enforce a message size limit
...
so we do not allocate loads of memory when receiving (accidental or
deliberate) garbage
2015-07-20 23:51:04 +01:00
Matthias Radestock
6f8622a1a0
replace outermost framing on tcp connection
...
switch from gob to length-prefix encoding
2015-07-20 23:51:04 +01:00
Matthias Radestock
af049efb40
refactor: s/SimpleTCP{Sender,Receiver}/GobTCP{Sender,Receiver}
2015-07-20 23:51:02 +01:00
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
Paul Bellamy
53628fdeff
Merge pull request #1187 from weaveworks/1182-proxy-tls-close
...
[proxy] Fully close TLS sockets, as they have no CloseWrite
2015-07-20 16:46:21 +01: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
Tom Wilkie