Matthias Radestock
08463ea403
Merge branch '1.0'
2015-07-08 16:54:24 +01:00
Matthias Radestock
26c1bcf866
clarify role of IP allocator range
...
Part of #1035 .
2015-07-08 16:51:25 +01:00
Michael Bridgen
4ede33468e
Update docs and smoke-tests with new option names
2015-07-07 11:26:09 +01:00
Bryan Boreham
f593c2fbf2
Change default IP allocation range from 10.128/10 to 10.32/12
2015-07-06 17:09:05 +01:00
Paul Bellamy
5c44f74475
rename proxy-(env|config) to (env|config)
...
Keep error message to stderr, as the proxy should be launched with
'weave launch'. 'proxy-(env|config)' are kept with a deprecation
warning, for a while.
2015-07-06 13:41:23 +01:00
Matthias Radestock
df31454c30
Merge commit 'c8032b6' into latest_release_doc_updates
2015-07-06 10:58:18 +01:00
Bryan Boreham
ff2d7451e2
Remove -debug option, superceded by --log-level
2015-07-04 03:27:07 +01:00
Matthias Radestock
b81fce32f6
one more s/proxy/Weave Docker API proxy
2015-07-03 11:51:12 +01:00
Matthias Radestock
f31a3c1261
Merge branch '1.0'
2015-07-03 11:48:07 +01:00
Matthias Radestock
9e32605183
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 11:45:37 +01:00
Matthias Radestock
9009e0eb7f
one more s/proxy/Weave Docker API proxy
2015-07-03 11:45:05 +01:00
Matthias Radestock
243d445d1b
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 10:59:10 +01:00
Matthias Radestock
65cd2b0e04
missed one
2015-07-03 10:58:22 +01:00
Matthias Radestock
33b230c114
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 10:56:00 +01:00
Matthias Radestock
7d5dcfafc9
introduce 'Proxy' as 'Docker API Proxy'
...
in order to reduce potential confusion about its role.
Closes #1019 .
2015-07-03 03:33:23 +01:00
Matthias Radestock
badfdee5e4
Merge branch '1.0'
2015-07-01 11:34:50 +01:00
Matthias Radestock
ba1e75405f
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-01 11:34:24 +01:00
Adam Harrison
5b9d350002
Draw attention to --hostname precedence
2015-07-01 11:15:08 +01:00
Michael Bridgen
c0b2fe3e3b
Remove references to 'IPAM' in docs and UI
...
The option `--no-default-ipam` is replaced with
`--no-default-ipalloc`; the former will still work (in a 'last one
wins' way), but its usage message says it's deprecated.
2015-06-29 19:20:26 +01:00
Tom Wilkie
c4565f6ed3
Make proxy listen on /var/run/weave.sock
2015-06-26 15:08:21 +00:00
Matthias Radestock
55fbffef75
Merge pull request #1009 from awh/weave_launch_all_the_things
...
Weave launch all the things
Closes #962 .
2015-06-26 13:21:44 +01:00
Adam Harrison
a9e3320e7c
Update documentation
2015-06-25 14:43:29 +01:00
Matthias Radestock
9a6afcd236
Merge branch '1.0'
2015-06-24 17:26:19 +01:00
Matthias Radestock
5f95de19ce
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-24 17:25:51 +01:00
David Kaltschmidt
00744fb9b4
use relative paths for stylesheet in docs
2015-06-24 17:54:50 +02:00
David Kaltschmidt
8250e05618
include stylesheet in repo, update footer
...
need because website's custom.css is fingerprinted
2015-06-24 17:18:54 +02:00
Matthias Radestock
ae1805de76
separate the image build and export phases
...
That way the export can be just a single tar, which is more
convenient. And without introducing unnecessary image builds.
2015-06-24 02:54:45 +01:00
Matthias Radestock
0ce123e63a
Merge branch '1.0'
2015-06-24 02:53:06 +01:00
Matthias Radestock
9ae45f6674
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-24 02:52:37 +01:00
Matthias Radestock
6c3aa99595
bump min required docker version for build
...
to the same version we use everywhere else, e.g. in weaveexec
2015-06-24 02:51:24 +01:00
Matthias Radestock
215d96fdc3
Merge branch '1.0'
2015-06-23 23:18:09 +01:00
Matthias Radestock
2c73fd6dde
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 23:17:38 +01:00
Matthias Radestock
3b27413887
fix broken link
2015-06-23 23:17:05 +01:00
Adam Harrison
aa8d9eab53
Merge branch '1.0'
2015-06-23 15:05:32 +01:00
Adam Harrison
17ee829299
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 15:05:02 +01:00
Adam Harrison
5db39466e8
Fix broken IPAM link
2015-06-23 15:04:37 +01:00
Matthias Radestock
43b8840dd2
Merge branch '1.0'
2015-06-23 14:58:55 +01:00
Matthias Radestock
cc4ab80f62
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:57:51 +01:00
Matthias Radestock
0e47cee661
remove references to dns, ipam and proxy docs from ToCs
...
Since they are now explained and referenced prominently from the main
Features documentation.
2015-06-23 14:53:49 +01:00
Adam Harrison
d6ab78ff03
Merge documentation from branch '1.0'
2015-06-23 14:36:04 +01:00
Adam Harrison
7e36dc01e8
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:35:30 +01:00
Adam Harrison
d0a1514ab6
Removed redundant further reading section from feature docs
2015-06-23 14:33:33 +01:00
Adam Harrison
06c3a0cf2a
Add docker integration section to feature docs
2015-06-23 14:33:29 +01:00
Adam Harrison
dde5782625
Merge documentation from branch '1.0'
2015-06-23 14:21:05 +01:00
Adam Harrison
a1913130e7
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:18:42 +01:00
Adam Harrison
19a3fc6b9e
Add naming and discovery section to features docs
2015-06-23 13:50:37 +01:00
Adam Harrison
043d15355c
Restore commit lost to force push
2015-06-23 11:53:22 +01:00
Matthias Radestock
cedf9bb82d
Merge branch '1.0'
2015-06-23 09:54:24 +01:00
Matthias Radestock
1b4f83c067
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 09:53:44 +01:00
Matthias Radestock
90b9b3c1bf
'address allocation' is the feature
...
covering both automatic and manual allocation
2015-06-23 09:50:39 +01:00
Matthias Radestock