Bryan Boreham
2d224d423d
Add SpaceRequestDenied message
2015-07-16 16:12:23 +01:00
Bryan Boreham
e7088e5daf
Extract decodeRange function
2015-07-16 16:12:23 +01:00
Bryan Boreham
d65409e97e
Improve comment & log for deferred claim
2015-07-16 16:12:23 +01:00
Matthias Radestock
70110e483c
Merge pull request #1166 from weaveworks/dns-tests
...
Make 210_dns_cross_hosts_test.sh excercise gossip dns tombstones.
2015-07-16 16:11:58 +01:00
Paul Bellamy
a0876becbc
Merge remote-tracking branch 'upstream/1.0'
...
Conflicts:
proxy/create_container_interceptor.go
proxy/create_exec_interceptor.go
proxy/proxy.go
proxy/start_container_interceptor.go
2015-07-16 15:29:29 +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
Matthias Radestock
aa3f35e38c
remove stale reference to weave launch-dns
2015-07-16 14:41:57 +01:00
Tom Wilkie
db77570779
Test is too long
2015-07-16 13:40:39 +00: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
Tom Wilkie
6e5995964d
Make 210_dns_cross_hosts_test.sh excercise gossip dns tombstones.
...
Also, make gce.sh less verbose, and do the env dance correctly.
2015-07-16 12:48:00 +00:00
Adam Harrison
da13238368
Merge branch '1.0'
2015-07-16 13:45:36 +01:00
Paul Bellamy
0865f4c207
Merge pull request #1099 from weaveworks/1055-proxy-autoconfig
...
Proxy autoconfig
2015-07-16 13:33:21 +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
Paul Bellamy
a4a31e632b
[proxy] Choose where to listen based on how launching client connected
2015-07-16 12:44:39 +01:00
Matthias Radestock
23ad547db4
Merge pull request #1155 from weaveworks/dns-gossip
...
Make DNS gossip converge correctly
Fixes #1151
2015-07-15 20:37:43 +01:00
Matthias Radestock
4d887c8a55
Merge branch '1.0'
...
Conflicts:
proxy/create_exec_interceptor.go
test/610_proxy_wait_for_weave_test.sh
2015-07-15 18:07:11 +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
Tom Wilkie
73210b6a70
Make sure DNS Gossip converges correctly.
...
- Abide by gossip interface (return nil, not empty gossip) so gossip converges!
- Make sure we don't say an old entry version is new to us; add some more tests.
- Add dns test for 3 (or N) hosts
- Extend mock gossip router to ensure reconsumption off diffs yield nil
- Don't increment version when re-adding existing entry.
2015-07-15 15:54:52 +00:00
Paul Bellamy
e4422205e8
[proxy] should not attempt weavewait in on weave container's execs
2015-07-15 16:14:14 +01:00
Tom Wilkie
9df7358ded
Add pprof handler to weaver.
2015-07-15 15:10:22 +00:00
Matthias Radestock
9507ea93dd
rename test since we have two 250_*
2015-07-15 14:46:51 +01:00
Matthias Radestock
52d3bcfe8b
Merge pull request #1149 from weaveworks/1118-respond-late-paxos
...
Respond to paxos messages when we already have a ring
Fixes #1118 .
2015-07-15 13:24:40 +01:00
Bryan Boreham
b3979c9505
Respond to paxos message if we already have a ring
2015-07-15 13:05:25 +01:00
Bryan Boreham
273a0fba47
Add sender to mock broadcast messages
2015-07-15 13:05:25 +01:00
Alvaro
7e34ec61f6
Merge pull request #1142 from weaveworks/1113-recursive-dns
...
Closes #1113
2015-07-15 13:42:59 +02:00
Bryan Boreham
acf13dc157
Add sender to OnGossipBroadcast()
2015-07-15 12:07:56 +01:00
Tom Wilkie
91395d6728
Use Msg.Copy!
2015-07-15 11:05:36 +00:00
Paul Bellamy
ef4a227ae9
Merge pull request #1144 from weaveworks/restart-docker-after-vagrant-tweaks
...
Restart docker after vagrant tweaking and refactor tweak-code
2015-07-15 11:34:59 +01:00
Alfonso Acosta
25589562cd
Restart docker after vagrant tweaking and refactor tweak-code
...
Docker needs to be restarted and not started, since it already starts running after installation
2015-07-15 09:31:47 +00:00
Matthias Radestock
7063ca51aa
remove dead code
2015-07-15 05:35:05 +01:00
Matthias Radestock
97498d26f7
remove dead code
2015-07-15 05:32:35 +01:00
Matthias Radestock
36292216fd
rename tests so they actually run
...
These tests were introduced in #1065 and #1126 .
2015-07-14 19:47:15 +01:00
Matthias Radestock
86448a1025
fix breakage
...
This wasn't spotted because #1065 , which removed launch-dns, got
merged just before #1126 , which introduced this test.
2015-07-14 19:42:59 +01:00
Ilya Dmitrichenko
b4f53edd91
Merge pull request #1138 from weaveworks/vagrantfile-update
...
update default vagrant box to ubuntu 15
2015-07-14 18:21:02 +01:00
Matthias Radestock
3a22d2e6a1
Merge pull request #1135 from weaveworks/issues/1028-weave-dns-lookup
...
Implement `weave dns-lookup`
Closes #1028 .
2015-07-14 18:19:26 +01:00
Matthias Radestock
9a4bbb55da
Merge branch '1.0'
...
Conflicts:
proxy/common.go
weave
2015-07-14 18:09:25 +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
Tom Wilkie
fa73240812
Copy dns requests and give them a fresh id when doing recursive queries.
2015-07-14 16:44:21 +00:00
Adam Harrison
a3dc2d0482
Smoketest dns-lookup
2015-07-14 17:36:30 +01:00
Adam Harrison
41834478d7
Rework documentation to use weave dns-lookup
2015-07-14 17:36:30 +01:00
Adam Harrison
6832ae20b0
Implement weave dns-lookup
2015-07-14 17:36:30 +01:00
Matthias Radestock
7ae06ef00d
Merge pull request #1126 from weaveworks/issues/1018-more-flexible-hostname-derivation
...
[proxy] More flexible container name -> hostname derivation
Closes #1018 .
2015-07-14 17:31:53 +01:00
Alvaro
a1ac0313e5
Merge pull request #1065 from weaveworks/gossipdns
...
Gossip-based DNS embedded in the router.
2015-07-14 18:30:16 +02:00
Paul Bellamy
d9c5d2f940
update default vagrant box to ubuntu 15
2015-07-14 17:08:26 +01:00
Tom Wilkie
361ed1b4a6
Resolve unqualified domains in the weave.local domain.
2015-07-14 16:05:41 +00:00
Alfonso Acosta
dfcc9678f3
Make weave usage fit into 80 columns
2015-07-14 16:02:19 +00:00