Matthias Radestock
4216231ec7
Merge branch '1.6'
2016-07-04 14:30:03 +01:00
Matthias Radestock
e5aeb4bd05
improve --trusted-subnets docs ( #2415 )
...
improve --trusted-subnets docs
Fixes #2211
2016-07-04 14:28:11 +01:00
Matthias Radestock
333d5f7511
Merge pull request #2412 from weaveworks/1803-plugin-create
...
Refactor plugin to create veths in CreateEndpoint
Fixes #1803 .
2016-07-04 12:19:01 +01:00
Matthias Radestock
7be7945b29
Merge branch '1.6'
2016-07-04 10:08:43 +01:00
Matthias Radestock
566ed64607
Merge pull request #2413 from weaveworks/2347-document-host
...
document --host
Fixes #2347 .
2016-07-04 10:07:48 +01:00
Anita Buehrle
83c358c8d2
edited sentence
2016-07-03 09:51:52 -05:00
Bryan Boreham
afe882cd94
Use more chars from endpointID to reduce clashes in veth names
...
Import library to get max name length IFNAMSIZ
2016-07-01 16:05:02 +01:00
Matthias Radestock
5b8a359475
Merge branch '1.6'
2016-07-01 10:31:39 +01:00
Matthias Radestock
ae95248499
Merge remote-tracking branch 'upstream/issues/2293-warn-router-down' into 1.6
2016-07-01 10:31:12 +01:00
Matthias Radestock
df0af203f8
Merge pull request #2416 from weaveworks/issues/2293-warn-router-down
...
Check that weave router is running before launching plugin
Fixes #2293 .
2016-07-01 10:24:15 +01:00
Bryan Boreham
53b8c804f2
Launch the whole of weave to avoid tripping over plugin-only test
2016-07-01 10:17:05 +01:00
Bryan Boreham
45a66ac517
Extend 'mac associated with other peer' error info
2016-06-30 18:02:39 +01:00
Bryan Boreham
087d948941
Check that weave router is running before launching plugin
2016-06-30 12:02:52 +01:00
Matthias Radestock
5b2a4ff614
Merge branch '1.6'
2016-06-29 20:12:58 +01:00
Matthias Radestock
72e92db96e
document --host
...
and add some broader points about access control early on, since some
users will wonder about that right from the start.
Fixes #2347
2016-06-29 20:09:02 +01:00
Matthias Radestock
768414534f
cosmetic: more logical order of args in usage
2016-06-29 20:00:47 +01:00
Bryan Boreham
ceb5f8c714
Move endpoint creation into CreateEndpoint so we can return the MAC address
2016-06-29 17:38:07 +01:00
Bryan Boreham
cc3359dfe5
Merge branch '1.6'
2016-06-29 14:42:17 +01:00
Bryan Boreham
f1ca4854b8
Merge pull request #2409 from weaveworks/issues/2381-awsvpc-fix-attach-router
...
Fix re-attaching of weave router in awsvpc mode
2016-06-29 14:41:14 +01:00
Martynas Pumputis
6319860230
Change the order of awsvpc initialization
...
We want to setup the necessary arp settings as soon as possible
and before we re-insert DNS entries. Otherwise, the announced
containers might not be reachable.
Also, do not try to reclaim for weave:expose inside populate_router,
because we do expose before calling it.
2016-06-29 11:15:56 +01:00
Martynas Pumputis
58caf38f07
Fix re-attaching of weave router in awsvpc mode
...
In order to re-attach the router and make it work in awsvpc mode,
the following has to be done:
- expose_ip on the router
- adjusting arp settings
- restoring host routes
To detect that we run in awsvpc mode, we inspect cmd parameters
of the weave router instead of GET'ing /ipinfo/tracker. This is so,
because the HTTP server started by the router might not be running
at the time of restoration.
2016-06-29 11:15:49 +01:00
Matthias Radestock
cda6785f1d
Merge remote-tracking branch 'upstream/master'
2016-06-29 05:58:29 +01:00
Matthias Radestock
cb030be4ad
Merge branch '1.6'
2016-06-29 05:57:01 +01:00
Matthias Radestock
7165414fc3
improve clock skew error message
...
Fixes #2174
2016-06-29 05:48:10 +01:00
Bryan Boreham
b464ce86f7
Merge branch '1.6'
2016-06-28 13:36:10 +00:00
Bryan Boreham
d72d3af36e
Remove deprecated -awsvpc option
2016-06-28 13:35:47 +00:00
Adam Harrison
80b3514e24
Merge branch '1.6'
2016-06-20 16:29:29 +01:00
Adam Harrison
f07ed7153b
Remove link to non-existent blog post
2016-06-20 15:32:00 +01:00
Adam Harrison
e33f56f9b0
Merge branch '1.6'
2016-06-20 14:53:03 +01:00
Adam Harrison
6c46af25cc
Fix typo
2016-06-20 14:47:52 +01:00
Adam Harrison
5ad227a8b3
Add release v1.6.0
2016-06-20 13:50:19 +01:00
Matthias Radestock
67fe1e5daf
clarify init-peer-count deprecation warning
...
Fixes #2355
2016-06-20 03:54:16 +01:00
Matthias Radestock
99b475056a
Merge branch '1.5'
2016-06-20 03:25:10 +01:00
Martynas Pumputis
804f4ad971
Add check-datapath to weaveutil
...
The utility is used to check whether a datapath can be created.
2016-06-20 03:24:30 +01:00
Martynas Pumputis
24d9a00f47
Add check-datapath to weaveutil
...
The utility is used to check whether a datapath can be created.
2016-06-20 03:20:46 +01:00
Matthias Radestock
b00e7d088e
Merge pull request #2372 from weaveworks/issues/2310-more-checkpoint
...
Add kernel version, Docker version and awsvpc setting to checkpoint info
Fixes #2310
2016-06-20 03:15:25 +01:00
Bryan Boreham
c12e909882
Document what is sent in checkpoint request
2016-06-20 03:13:10 +01:00
Anita Buehrle
6356fbc882
Ops edits ( #2371 )
2016-06-20 03:04:53 +01:00
Matthias Radestock
ca7220b775
Merge branch '1.5'
2016-06-19 02:51:52 +01:00
Matthias Radestock
619a02eefb
fix a couple of typos
2016-06-19 02:51:11 +01:00
Martynas Pumputis
85c1a31e5c
Merge pull request #2383 from weaveworks/proxy-buffer
...
Use buffered writer for http headers
2016-06-17 17:29:39 +01:00
Bryan Boreham
f86ade6568
Squash up the code via 'defer'
2016-06-17 16:52:17 +01:00
Bryan Boreham
81fa4059df
Use buffered writer for http headers
2016-06-17 16:52:17 +01:00
Matthias Radestock
e77bf60d34
Merge branch '1.5'
2016-06-17 15:48:33 +01:00
Matthias Radestock
61cb5535db
Merge pull request #2385 from weaveworks/2286-fix-check
...
Fix check before removing plugin sockets
Fixes the fix in #2292 .
2016-06-17 15:47:48 +01:00
Bryan Boreham
63314beb2a
Remove plugin sockets in 'weave reset'
2016-06-17 15:17:13 +01:00
Bryan Boreham
2d0be34a93
Fix check to see if plugin is running
2016-06-17 15:17:13 +01:00
Matthias Radestock
0abfdf4efb
Merge branch '1.5'
2016-06-17 15:07:34 +01:00
Matthias Radestock
b014de3f08
Merge pull request #2382 from weaveworks/issues/2379
...
Fix Docker 1.12 incompatibilities
Fixes #2379 .
2016-06-17 15:06:55 +01:00
Bryan Boreham
56c275a9bf
Copy Docker's response code through for raw stream.
...
This means when Docker says "101 UPGRADED" the proxy will say the
same, instead of "200 OK". Docker 1.12 barfs if you do that.
2016-06-17 13:07:04 +01:00
Matthias Radestock