Matthias Radestock
edb4911bf6
Merge branch '1.0'
2015-06-21 09:39:45 +01:00
Matthias Radestock
d913ca869c
Merge branch '967_include_image_name_in_inspect_error' into 1.0
2015-06-21 09:38:42 +01:00
Michael Bridgen
e3917121fa
Merge remote-tracking branch 'upstream/1.0.0'
2015-06-20 16:45:34 -07:00
Michael Bridgen
ede288ad38
Merge pull request #969 from rade/967_include_image_name_in_inspect_error
...
include image name in errors
2015-06-20 16:41:05 -07:00
Michael Bridgen
58f14551dc
Merge branch 'pr969'
2015-06-20 16:28:44 -07:00
Michael Bridgen
97816d6c54
Merge branch '967_include_image_name_in_inspect_error' of https://github.com/rade/weave into pr969
2015-06-20 16:21:20 -07:00
Matthias Radestock
3732f968d0
include image name in errors
...
The go docker client's ErrNoSuchImage does not include the image
name. However, it is imperative that this name appears in error
messages sent to clients, since the docker client, as of version
1.7.0, only automatically pulls images when their name is present in
the error.
Fixes #967 .
2015-06-20 23:36:48 +01:00
Matthias Radestock
939a095bf4
Merge pull request #966 from weaveworks/readme_website_sync
...
README update to point at weave.works
2015-06-19 20:38:37 +01:00
Fintan Ryan
ad0d53f7fe
Update proposed text
2015-06-19 19:17:43 +01:00
Fintan Ryan
e748ddc20d
README update to point at weave.works
2015-06-19 13:00:01 +01:00
Matthias Radestock
e51ecd73b3
refactor: extract helper
2015-06-18 19:01:10 +01:00
Matthias Radestock
5479d0a54d
improve test performance - only fetch status once per check
2015-06-18 18:53:06 +01:00
Matthias Radestock
6830b27317
cosmetic: correct some comments, tweak some arg parsing
2015-06-18 18:13:27 +01:00
Matthias Radestock
4399be7ad2
correct comments
2015-06-18 17:55:42 +01:00
Matthias Radestock
42d2a860eb
test more things, more obviously
2015-06-18 17:48:21 +01:00
Matthias Radestock
3ec0200067
cosmetic oops
2015-06-18 16:57:54 +01:00
Matthias Radestock
d1e4a8ec8a
cosmetic: vertical alignment and consistency for better readability
2015-06-18 16:26:16 +01:00
Paul Bellamy
54b3061c50
Merge gofmt and goimports run
2015-06-18 14:05:51 +01:00
Bryan Boreham
19fe808dff
Update links in changelog to point at latest_release
2015-06-18 11:59:44 +01:00
Bryan Boreham
b7281cc08d
Add release 1.0.0
2015-06-18 11:23:44 +01:00
Adam Harrison
617c3883c7
Merge pull request #948 from awh/v1.0_doc_updates
...
Update documentation to leverage IPAM and DNS
2015-06-18 10:38:32 +01:00
Adam Harrison
9e20a5256b
Rename example containers
2015-06-18 10:32:15 +01:00
Matthias Radestock
a3db33cfd9
more helpful error message when weave et al die on startup
...
Closes #958 .
2015-06-17 22:54:11 +01:00
Adam Harrison
aa8a86a0b9
Update service binding example
2015-06-17 17:34:15 +01:00
Adam Harrison
7238192150
Update service routing example
2015-06-17 17:34:15 +01:00
Adam Harrison
caa0e31be2
Update service import example
2015-06-17 17:34:15 +01:00
Adam Harrison
5a6cafc3da
Update service export example
2015-06-17 17:34:15 +01:00
Adam Harrison
1df52350fa
Update host network integration example
2015-06-17 17:34:15 +01:00
Adam Harrison
40323202f5
Update dynamic attachment example
2015-06-17 17:34:15 +01:00
Adam Harrison
0d83f24661
Prefer -ti to -t -i in updated examples
2015-06-17 17:34:15 +01:00
Adam Harrison
8550469c9f
Update subnet isolation example
2015-06-17 17:34:15 +01:00
Adam Harrison
e5679a787c
Update subnet isolation example
2015-06-17 17:34:15 +01:00
Adam Harrison
e37a4314b3
Add manual addressing to features
2015-06-17 17:34:10 +01:00
Adam Harrison
7b5ee8fb65
Update virtual ethernet switch example
2015-06-17 17:32:40 +01:00
Adam Harrison
cf5835f081
Update README examples to use IPAM and DNS
2015-06-17 17:32:40 +01:00
Paul Bellamy
21e07c0db9
Running gofmt -s
2015-06-17 15:32:08 +01:00
Paul Bellamy
06101d134b
Running goimports
2015-06-17 15:32:08 +01:00
Matthias Radestock
501108e3ae
cosmetic: vertical alignment
2015-06-17 15:13:07 +01:00
Matthias Radestock
87fe10ab5d
Merge pull request #952 from paulbellamy/950-proxy-launch-router
...
Add support for WEAVE_CIDR=none
Fixes #950 .
2015-06-17 14:57:35 +01:00
Paul Bellamy
6c26a55b5a
[proxy] refactor weaveCIDRsFromConfig slightly
2015-06-17 14:51:12 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Bryan Boreham
ff838a14d9
Fix terminology in error message.
...
Also removed hint on usage, because `-iprange` is on by default.
2015-06-17 13:16:53 +01:00
Matthias Radestock
c45b586a44
Merge pull request #949 from paulbellamy/939-proxy-env-bug
...
remove spurious output from proxy-(env|config)
Fixes #939 .
2015-06-17 12:10:09 +01:00
Matthias Radestock
215312bb5f
Merge pull request #946 from bboreham/758-expand-ipam-docs
...
Expand description of -initpeercount in docs
Closes #758 .
2015-06-17 12:06:04 +01:00
Bryan Boreham
34e0e3bb24
Merge pull request #935 from bboreham/weavedns-races
...
All unit and smoke tests passed.
2015-06-17 12:05:43 +01:00
Paul Bellamy
b1f43f0d7c
[proxy] Remove spurious output from proxy-(env|config)
...
`docker log` outputs an error if stdout is closed before it is done, so
silence that
2015-06-17 11:53:28 +01:00
Bryan Boreham
40efc347b6
Cosmetic
2015-06-17 11:41:46 +01:00
Matthias Radestock
71f19469ab
Merge pull request #947 from paulbellamy/940-proxy-default-ipam
...
[proxy] --with-ipam -> --no-default-ipam
Closes #940 .
2015-06-17 11:37:25 +01:00
Bryan Boreham
9636675c2c
Split part of DNSServer.Start() to a separate ActivateAndServe()
...
Specifically, move the part that blocks, and call that as necessary.
This means Start() can run on the caller's goroutine and avoid race conditions.
2015-06-17 11:35:53 +01:00
Bryan Boreham
1b57a24789
Don't re-initialise log writers unless the type changed.
...
This avoids race-conditions in unit tests where the initialisation
is on a different goroutine to the logging.
2015-06-17 11:35:01 +01:00
Matthias Radestock