Adam Harrison
8ec6b699b1
Merge branch '1.6'
2016-07-18 11:48:08 +01:00
Adam Harrison
369852a3a7
Merge pull request #2430 from weaveworks/remove-duplicate-no-dns
...
remove duplication of `--no-dns`
2016-07-18 11:47:48 +01:00
Matthias Radestock
c82be57639
Merge pull request #2423 from philwinder/docs/cni-mesos
...
Refactor CNI documentation.
2016-07-18 09:58:00 +01:00
Phil Winder
092c3a17d1
Change title.
2016-07-18 09:22:24 +01:00
Matthias Radestock
551f164ec3
Merge branch '1.6'
2016-07-12 20:47:23 +01:00
Matthias Radestock
acdd739deb
Merge branch 'fix-broken-link' into 1.6
2016-07-12 20:46:52 +01:00
Paul Bellamy
45e3016c6a
Fixing a broken link in docs
2016-07-12 20:44:57 +01:00
Bryan Boreham
88bf64722f
Merge branch '1.6'
2016-07-12 10:33:38 +00:00
Bryan Boreham
c1483dbf1f
Merge pull request #2418 from weaveworks/issues/2388-weave-ps
...
Fix "weave ps"; fixes #2388
2016-07-12 11:04:00 +01:00
Matthias Radestock
d9c998b5c4
Merge pull request #2386 from weaveworks/issues/354-multicast-isolation
...
Provide multicast isolation with in-container-netns iptables rules
Fixes #354 .
2016-07-12 09:46:14 +01:00
Adam Harrison
170e19c283
Merge branch '1.6'
2016-07-12 09:39:45 +01:00
Adam Harrison
bce07b7491
Merge pull request #2439 from weaveworks/restore-script-function-grouping
...
refactor: restore grouping of functions in script
2016-07-12 09:39:15 +01:00
Matthias Radestock
8b5741506d
refactor: restore grouping of functions in script
...
Recent(ish) changes placed functions in the wrong sections. Fix that
and label the sections more clearly.
2016-07-11 21:38:07 +01:00
Matthias Radestock
791ab55875
Merge branch '1.6'
2016-07-09 05:42:02 +01:00
Matthias Radestock
e642f366f5
cosmetic
2016-07-09 05:41:37 +01:00
Bryan Boreham
bd1a9d020c
Merge branch '1.6'
2016-07-07 11:20:50 +00:00
pidster
d794b203f7
Adds ipam option to help.
...
Fixes https://github.com/weaveworks/weave/issues/2425
2016-07-07 11:20:00 +00:00
Matthias Radestock
7ec68119a6
remove duplication of --no-dns
...
This was harmless, but annoying.
2016-07-06 23:21:42 +01:00
Martynas Pumputis
71fd3b6b2b
Merge remote-tracking branch 'origin/1.6'
2016-07-05 17:37:50 +01:00
Martynas Pumputis
93c60395f6
Merge pull request #2417 from weaveworks/issues/1852-less-logging
...
Move 'ODP miss' log from every miss to specific places
Fixes #1852
2016-07-05 17:34:57 +01:00
Phil Winder
af27aa04f2
Add Mesos instructions. Edit old links.
2016-07-05 16:01:01 +01:00
Martynas Pumputis
0861d05522
Address PR comments
...
- Do not re-enter the root netns when querying weave bridge.
- Enter the root netns when constructing the predicate.
2016-07-05 15:12:39 +01:00
Martynas Pumputis
89221f117b
Denote WithNetNS* functions with unsafe
...
Please see https://github.com/weaveworks/weave/issues/2388#issuecomment-228365069
for more details.
2016-07-05 15:12:39 +01:00
Martynas Pumputis
7f5c37ef1e
Fix "weave ps"
...
Make sure that any network namespace changes happens at the end of
the cmd invocation. Otherwise, we are risking to end up in a situation
in which OS scheduling threads are in a "wrong" namespace.
See WithNetNS for more details.
2016-07-05 15:12:39 +01:00
Martynas Pumputis
05baa566c6
Refactor common.GetBridgeNetDev
...
- Optimize. Use LinkByName instead of iterating over list of available
links. Linux does not support interfaces with the same names.
- Remove unnecessary indirection in utility functions which return
common.NetDev.
2016-07-05 15:12:39 +01:00
Bryan Boreham
f8ac27a6cc
Merge branch '1.6'
2016-07-05 13:22:25 +01:00
Bryan Boreham
e5c23bf9f5
Don't crash if docker API is disabled by params
2016-07-05 13:02:59 +01:00
Matthias Radestock
954cd0b86a
Merge branch '1.6'
2016-07-04 16:27:59 +01:00
Matthias Radestock
0635ed1854
highlight the need for weave expose in CNI/k8s ( #2411 )
...
* highlight the need for `weave expose` in CNI/k8s
Fixes #2405
* Extend error message
* rearranged the sentences
weave launch <peer hosts> seems a bit orphaned here maybe include the weave connect command as well, since it's being mentioned.
2016-07-04 16:27:11 +01:00
Matthias Radestock
9dedeadf15
Merge branch '1.6'
2016-07-04 16:22:42 +01:00
Matthias Radestock
4424e877f0
Merge branch '1710-lb-clarification' into 1.6
2016-07-04 16:21:54 +01:00
Matthias Radestock
6561272f8d
Merge branch '1.6'
2016-07-04 16:20:37 +01:00
Matthias Radestock
aa54d332c2
correct RFC3484 address selection caveat ( #2407 )
...
and move it to a more prominent location
Fixes #1710
2016-07-04 16:20:19 +01:00
Matthias Radestock
881e795db5
correct RFC3484 address selection caveat ( #2407 )
...
and move it to a more prominent location
Fixes #1710
2016-07-04 16:19:20 +01:00
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
7d0aaea6e8
Move 'ODP miss' log from every miss to specific places
...
Added log lines for packets that we will broadcast;
Added log lines for flows we don't know how to handle;
Moved the line for when we expect to insert a flow down to the miss-handler;
Packets handled by the bridge already have their own logging via --pktdebug
2016-07-01 10:12:53 +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