Adam Harrison
2ea027d3a8
Merge branch '1.6'
2016-09-21 11:15:49 +01:00
Adam Harrison
3fc7efa536
Merge pull request #2498 from weaveworks/broken-link
...
fixed broken link to command line args
2016-09-20 16:40:06 +01:00
Adam Harrison
a556deec78
Merge branch '1.6'
2016-09-20 16:26:48 +01:00
Bryan Boreham
370f258c3a
Fix outdated option ipam-seed
2016-09-16 15:53:43 -07:00
Anita Buehrle
8ed0c13645
removed broken link
2016-09-06 14:36:25 +01:00
Anita Buehrle
b635f9a994
fixed broken link to command line args
2016-09-06 14:36:25 +01:00
Martynas Pumputis
57357a728c
Merge branch '1.6'
2016-09-05 13:48:30 +03:00
Martynas Pumputis
a335c419ec
Fix typo
2016-09-05 13:27:49 +03:00
Martynas Pumputis
c509b6e5bb
Revert "Derive the bridge MAC from concatenated multiple sources"
...
This reverts commit c2083cbce0
2016-08-15 09:48:55 +01:00
Bryan Boreham
a466f55d59
Merge pull request #2462 from weaveworks/note-proxy-file
...
added note about net flag
2016-08-12 16:55:57 +01:00
Bryan Boreham
c79b6a8bd7
Merge pull request #2460 from weaveworks/issues/2427-detect-peerid-clashes
...
Detect and report peer name collisions
2016-08-12 16:52:56 +01:00
Martynas Pumputis
c2083cbce0
Derive the bridge MAC from concatenated multiple sources
...
The sources include:
- /etc/machine-id (generated by "systemd-machine-id-setup") or
/var/lib/dbus/machine-id (generated by "dbus-uuidgen").
- /sys/class/dmi/id/product_uuid.
- /sys/hypervisor/uuid.
The product of the concatenation should produce an unique identifier
which is stable across reboots.
2016-08-11 12:01:35 +01:00
Bryan Boreham
081b95dfd0
CNI plugin assigns an IP to the bridge by itself
...
No need to call `weave expose` before use.
2016-08-08 15:28:26 +01:00
Anita Buehrle
3273d13666
gave points numbers for clarity
2016-08-02 16:40:16 -05:00
abuehrle
5fdbbf3722
wording formatting
2016-08-02 16:38:41 -05:00
abuehrle
14350ff463
added anchor to attaching containers
2016-08-02 16:35:52 -05:00
abuehrle
0b49c961a7
reconfigured note to include additional method
2016-08-02 16:30:32 -05:00
abuehrle
39b80f26ed
made terminology consistent
2016-08-02 13:15:17 -05:00
abuehrle
74b20265e4
fixed links and some titles
2016-08-02 12:59:27 -05:00
abuehrle
358fddb958
fixed broken link and title
2016-08-02 12:52:36 -05:00
abuehrle
5c8f6175b5
added note about net flag
2016-08-02 12:34:52 -05:00
Adam Harrison
ed83efbceb
Merge pull request #2450 from weaveworks/eval-considered-harmless
...
remove dire warnings about 'eval' when using plugin
2016-07-28 12:49:55 +01:00
Matthias Radestock
8056a098a8
remove dire warnings about 'eval' when using plugin
...
since as of #2330 the proxy ignores containers started with specified
user networks.
2016-07-28 11:49:54 +01:00
abuehrle
15a2cba7f8
added anchors to concepts
2016-07-28 11:49:06 +01:00
Anita Buehrle
b37bb02a8b
intro to ops guide ( #2387 )
2016-07-28 11:49:06 +01:00
Matthias Radestock
f6e6926171
cosmetic: fix wrapped quote
...
apparently our wp md renderer does not handle this correctly
2016-07-20 07:09:09 +01:00
Matthias Radestock
25e7868cd5
fix some indentation in docs block quote
2016-07-20 07:03:17 +01:00
Matthias Radestock
3755906689
blockquote sudo-ing
2016-07-20 06:26:23 +01:00
Matthias Radestock
63cbb34dec
Make use of sudo -s more explicit
...
since people keep tripping over that.
Also
- add new error message spat out by recent dockers correct the socket
- URLs - they had fallen victim to a 'docker'->'Docker' replacement
- shorten the note on using the plugin
2016-07-20 06:26:03 +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
Paul Bellamy
45e3016c6a
Fixing a broken link in docs
2016-07-12 20:44:57 +01:00
Phil Winder
af27aa04f2
Add Mesos instructions. Edit old links.
2016-07-05 16:01:01 +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
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
e5aeb4bd05
improve --trusted-subnets docs ( #2415 )
...
improve --trusted-subnets docs
Fixes #2211
2016-07-04 14:28:11 +01:00
Anita Buehrle
83c358c8d2
edited sentence
2016-07-03 09:51:52 -05: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
Adam Harrison
f07ed7153b
Remove link to non-existent blog post
2016-06-20 15:32:00 +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
Bryan Boreham
7182ec0463
Merge pull request #2338 from weaveworks/awsvpc-docs
...
awsvpc docs
2016-06-15 16:59:54 +01:00
Bryan Boreham
425f17aab1
Mention that 'weave launch' now waits
2016-06-15 16:58:05 +01:00
Bryan Boreham
3494cc39c1
Expand description surrounding link to awsvpc mode
2016-06-15 16:58:05 +01:00
Bryan Boreham
bb203a2d18
Merge branch '1.5'
2016-06-15 13:50:47 +01:00
Bryan Boreham
08e2c5c14e
Fix link for 'docker run' docs
2016-06-15 13:48:25 +01:00
Bryan Boreham
a4f3e763bb
Use our own ubuntu image
2016-06-15 13:47:20 +01:00
Adam Harrison