Alvaro
475daa82b3
Merge pull request #1273 from weaveworks/1270_mdns_result_race
...
ignore DuplicateError when inserting mDNS answer in zone
2015-08-10 11:15:47 +02:00
Matthias Radestock
c3b653b1b9
ignore DuplicateError when inserting mDNS answer in zone
...
When we issue two concurrent mDNS queries for the same name, the
answer to the second one encounters a DuplicateError when inserting
into the zone. We would return that error, which causes the query
would fail. And we'd cache that fact. All bad.
So ignore DuplicateError.
Fixes #1270 .
2015-08-08 22:01:45 +01:00
Adam Harrison
ed3207afe7
Merge remote-tracking branch 'upstream/latest_release_doc_updates' into 1.0
2015-08-06 09:51:31 +01:00
Adam Harrison
8e5b0ceceb
Merge pull request #1262 from weaveworks/latest_release_doc_udpates
...
Fix IPAM doc bug
2015-08-06 09:48:14 +01:00
Adam Harrison
4a1bb1a33a
Fix IPAM doc bug
2015-08-05 17:53:24 +01:00
Adam Harrison
93984e1955
Merge pull request #1261 from weaveworks/arp_all_ips
...
send ARP update for *all* container IPs; not just the first one
2015-08-05 14:38:16 +01:00
Matthias Radestock
67aae051d6
send ARP update for *all* container IPs; not just the first one
...
This was missed in #498 .
2015-08-05 13:35:35 +01:00
Paul Bellamy
eee13e7dd9
Merge pull request #1253 from weaveworks/1241-no-command-specified
...
[proxy] Handle case where no command is specified.
2015-08-04 13:11:35 +01:00
Paul Bellamy
7cc53c4c68
[proxy] Handle case where no command is specified.
...
The docker daemon can't do this because we set /w/w.
2015-08-04 12:32:42 +01:00
Paul Bellamy
78e0e79b26
Merge pull request #1238 from weaveworks/1232-weavewait-image
...
[proxy] only mount /w into weavewaited containers
2015-07-31 10:57:26 +01:00
Paul Bellamy
4958b8d37a
[proxy] Mount /w from the host for weavewaited containers
...
We set it at container create. Had tried also setting it at start, but
it seems to cause weird behaviour, and there is no way to do it from the
CLI.
2015-07-30 15:11:03 +01:00
Paul Bellamy
e2389a4061
[proxy] Don't try to attach if container failed to start
2015-07-30 13:31:47 +01:00
Paul Bellamy
5e9bd5424a
Removed all the imports from "code.google.com"
2015-07-29 15:47:02 +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
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
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
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
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
David Kaltschmidt
e7f6682593
Use bootstrap alert styles for blockquote
2015-07-17 15:14:29 +02:00
Paul Bellamy
3f4b385b0f
[proxy] If we can't CloseWrite a connection (tls), just Close it so clients don't hang
2015-07-17 14:09:27 +01:00
Paul Bellamy
5fc16a8267
[proxy] use a waitgroup as it's more semantically accurate
2015-07-17 14:08:51 +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
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
Paul Bellamy
1afdac4d2c
Merge pull request #1167 from weaveworks/1157-proxy-net-host
...
[proxy] do not weave attach containers in '--net=host|container:<name|id>'
2015-07-16 15:24:37 +01:00
Paul Bellamy
c6fa9cb17e
refactor weaveCIDRsFromConfig to return an error message
2015-07-16 15:15:32 +01:00
Paul Bellamy
9619a27f8c
[proxy] adding log message for ignored containers
2015-07-16 14:01:22 +01:00
Paul Bellamy
c13154eea9
updating comment as per golint
2015-07-16 13:58:30 +01:00
Paul Bellamy
1132d26d47
[proxy] do not weave attach containers in '--net=host|container:<name|id>'
2015-07-16 13:58:27 +01:00
Adam Harrison
77bc56751b
Merge pull request #1164 from weaveworks/1162_detect_host_netns_in_container
...
fix detection of host netns when weave script runs inside container
2015-07-16 13:33:19 +01:00
Matthias Radestock
b32c017f33
fix detection of host netns when weave script runs inside container
...
$$ refers to the pid in the container's process namespace, so using it
as a reference into /hostproc is entirely wrong.
Fixes #1162 .
2015-07-16 13:19:56 +01:00
Matthias Radestock
a982146cbe
Merge pull request #1153 from weaveworks/1143-non-weave-exec
...
[proxy] should not attempt weavewait in on weave container's execs
Fixes #1143 .
2015-07-15 17:40:13 +01:00
Paul Bellamy
e4422205e8
[proxy] should not attempt weavewait in on weave container's execs
2015-07-15 16:14:14 +01:00
Matthias Radestock
b476bd2afe
Merge pull request #1137 from weaveworks/1109-docker-bridge-ip
...
[proxy] respect custom DOCKER_BRIDGE
Fixes #1109 .
2015-07-14 17:52:08 +01:00
Paul Bellamy
acd8bdec21
[proxy] respect custom DOCKER_BRIDGE
2015-07-14 16:33:35 +01:00
Matthias Radestock
6386c1bd18
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-14 15:36:55 +01:00
Matthias Radestock
2e93a4c18e
Merge pull request #1132 from weaveworks/issues/945-secure-router-config
...
Improvements to password handling recommendations
Closes #945 .
2015-07-14 15:31:20 +01:00
Adam Harrison
e26e7e29f2
Improvements to password handling recommendations
2015-07-14 14:48:58 +01:00
Matthias Radestock
1f3d054b09
Merge pull request #1124 from weaveworks/issues/1037-mitigate-entropy-depletion
...
Mitigate entropy depletion
Closes #1037 .
2015-07-13 19:06:54 +01:00
Adam Harrison
e2f8b6f9fd
Document /dev/random blocking issue
2015-07-13 15:02:31 +01:00
Adam Harrison
f3c4a9fc6d
Limit router accept rate with token bucket
2015-07-13 15:02:31 +01:00
Adam Harrison
9634526a67
Add token bucket implementation
2015-07-13 15:01:04 +01:00
Adam Harrison
b67c102fe5
Remove simple sleep from router accept
2015-07-13 15:01:04 +01:00
Adam Harrison
835d99e6fe
Merge pull request #1104 from weaveworks/1083-async-claim
...
Don't wait to claim addresses from IPAM
2015-07-10 14:03:05 +01:00
Bryan Boreham
b93070f91a
Fix log message on peer move
2015-07-09 12:51:52 +01:00
Alvaro