Matthias Radestock
efffbe6de1
Merge pull request #1913 from weaveworks/fix-smoketests-docker-1.10
...
Fix smoke tests for docker 1.10
2016-01-21 17:30:52 +00:00
Adam Harrison
a64435a9a5
Adjust tests to accomodate docker/docker#14012
2016-01-21 17:28:54 +00:00
Bryan Boreham
c2fba38c46
Merge pull request #1902 from weaveworks/vendored-dep-management-doc
...
Document vendored dependency management commands
2016-01-21 14:14:47 +00:00
Matthias Radestock
d2ba647f68
Merge pull request #1920 from weaveworks/1893-make-testrunner
...
move smoke test dependencies from 'all' to 'testrunner' target
Fixes #1893 .
2016-01-21 13:46:34 +00:00
Matthias Radestock
a6aad6dc49
move smoke test dependencies from 'all' to 'testrunner' target
...
That way a plain 'make' works out-of-the-box.
Fixes #1893 .
2016-01-21 13:00:32 +00:00
Matthias Radestock
0872623ca5
Merge branch '1.4'
2016-01-21 12:30:32 +00:00
Matthias Radestock
75e812a061
Merge branch 'latest_release_doc_updates' into 1.4
2016-01-21 12:30:14 +00:00
Matthias Radestock
4cc7b01940
Merge pull request #1907 from weaveworks/systemd-timeout
...
Suggest disabling systemd timeout if using Weave Net plugin
2016-01-21 12:29:42 +00:00
Matthias Radestock
4d05775e11
Merge branch '1.4'
2016-01-21 11:30:05 +00:00
Matthias Radestock
a2ff7e5981
Merge pull request #1919 from weaveworks/issues/1900-dont-stop-stoppin
...
Warn, don't error, if unable to remove network in 'weave stop'
Fixes #1900 .
2016-01-21 11:22:21 +00:00
Matthias Radestock
d5bfc61a73
use hashicorp's wily64 images instead of ubuntu's
...
The latter suffer from https://github.com/mitchellh/vagrant/issues/6653
2016-01-21 11:08:14 +00:00
Bryan Boreham
7ec17ab2ef
Merge branch '1.4'
2016-01-21 10:18:01 +00:00
Bryan Boreham
cda98a6375
Merge pull request #1917 from weaveworks/issues/1911-fix-unexpected-eof
...
Fix unexpected EOF with Docker 1.10-rc1 and proxy --rewrite-inspect
2016-01-21 10:15:20 +00:00
Matthias Radestock
03ac917567
Merge branch '1.4'
2016-01-20 18:56:59 +00:00
Matthias Radestock
3b7a754b0a
Merge branch 'latest_release_doc_updates' into 1.4
2016-01-20 18:56:26 +00:00
Anita Buehrle
c01c6bcb91
fixed logo image in header
2016-01-20 12:48:31 -06:00
Bryan Boreham
e47360f8dc
Warn, don't error, if unable to remove network in 'weave stop'
2016-01-20 16:18:09 +00:00
Matthias Radestock
bafa3f4f4e
Merge pull request #1912 from weaveworks/wily-vagrant
...
Update Vagrant to use Wily 15.10
2016-01-20 14:59:40 +00:00
Adam Harrison
14944da396
Ignore stderr in proxy_addrs
2016-01-20 14:24:59 +00:00
Adam Harrison
a3974c2aeb
Abort inspect exec rewrite unless Containers node is present
2016-01-20 14:24:28 +00:00
Bryan Boreham
6570b0ba1a
Merge branch '1.4'
2016-01-20 14:06:00 +00:00
Bryan Boreham
13ec517f94
Merge pull request #1910 from weaveworks/1909-forEachRoute-panic
...
cope with errors during route traversal
2016-01-20 14:05:10 +00:00
Adam Harrison
2a2b2da097
Update Vagrant to use Wily 15.10
2016-01-20 09:17:07 +00:00
Matthias Radestock
43419815f4
bypass netlink.LinkByIndex
...
since we are seeing some cases where it returns "Link not found" when
the link is in fact there.
2016-01-19 16:36:16 +00:00
Matthias Radestock
b5256f7b71
refactor: inline
...
This eliminates the unnecessary indirection via interface names,
instead identifying the interface by its index.
2016-01-19 16:36:16 +00:00
Matthias Radestock
0caa9dd652
cope with errors during route traversal
...
Fixes #1909 .
2016-01-19 15:28:31 +00:00
Bryan Boreham
dd7271aaa2
Merge pull request #1866 from weaveworks/901-peername-from-machine-id
...
Derive peer name from product_uuid; LGTM
2016-01-18 15:29:44 +00:00
Matthias Radestock
133c16f989
document new reboot behaviour
...
...and generally tidy up IPAM stop/restart docs.
2016-01-18 14:57:03 +00:00
Matthias Radestock
e631fb0d69
derive the bridge MAC from the system (aka BIOS) UUID
...
...if possible. This provides a stable peer identity across
reboots. If we cannot determinbe the system UUID then we revert to a
random MAC, as before.
Fixes #901 .
2016-01-18 14:56:55 +00:00
Bryan Boreham
5e1e8ec543
Suggest user disables systemd timeout if using plugin
2016-01-18 11:45:17 +00:00
Adam Harrison
432c1904da
Merge pull request #1890 from weaveworks/1889-vendor-mesh
...
Change import location for mesh
2016-01-15 17:18:31 +00:00
Adam Harrison
8a691814e2
Document vendored dependency management commands
2016-01-15 16:17:07 +00:00
Peter Bourgon
553c8b734d
git submodule add weaveworks/mesh
2016-01-15 16:03:42 +01:00
Peter Bourgon
3767a680e8
Makefile doesn't need to build mesh/*.go anymore
2016-01-15 15:57:01 +01:00
Peter Bourgon
e27b320ede
Update import location for mesh
2016-01-15 15:57:01 +01:00
Peter Bourgon
90afa7db93
git rm -rf mesh
2016-01-15 15:57:01 +01:00
Bryan Boreham
efd4fc4704
Merge pull request #1901 from weaveworks/1897-weaveutil-plugin-network
...
move plugin network creation/removal into weaveutil
2016-01-15 11:07:38 +00:00
Matthias Radestock
d770532b08
improve error handling
2016-01-15 08:53:04 +00:00
Matthias Radestock
31b303a419
move plugin network creation into weaveutil
...
Note that we remove the ability to set the weavemesh network name, or
disabling it altogether. This was always poorly support, since the
removal operation only ever operated on the default name. The option
was also not listed in the usage, though it was in the docs.
2016-01-15 08:52:57 +00:00
Matthias Radestock
9578798ec0
move plugin network removal into weaveutil
...
This does require starting containerised weaveutil with docker.sock
volume mounts.
2016-01-15 07:58:21 +00:00
Matthias Radestock
8061ea4079
don't attempt to delete the mesh network on plugin termination
...
It's pointless and inconsistent. Firstly, deletion will fail if there
are any attached containers. Secondly, we run the plugin with
restart=always, so it will get restarted and the network re-created.
Removal of the network does still happen on `weave stop|reset`, if
possible.
2016-01-15 06:21:11 +00:00
Tom Wilkie
a83b58cd27
Merge pull request #1896 from weaveworks/tweak-circle
...
Improve build times on CircleCI
2016-01-14 08:57:20 -08:00
Bryan Boreham
8eeb6dd836
Only rebuild without coverage if we're going to publish
2016-01-14 15:33:46 +00:00
Bryan Boreham
bd7e5d6921
Do a build before the 'go test'; perversely this runs faster
2016-01-14 15:29:58 +00:00
Bryan Boreham
7c1e80ca89
Don't do coverage on vendored directories
2016-01-14 14:16:28 +00:00
Bryan Boreham
9aae1fa3c9
Save the ~/docker directory in cache because rebuild_image stores things there
2016-01-14 13:02:32 +00:00
Adam Harrison
5bf440d558
Merge branch '1.4'
2016-01-14 12:07:21 +00:00
Adam Harrison
c391092ea6
Add release v1.4.2
2016-01-14 11:40:17 +00:00
Matthias Radestock
d97c385b4e
make 'make lint' run gocyclo (again)
2016-01-13 17:02:52 +00:00
Matthias Radestock
1d3ca061ad
tiny refactor: tweak init order for better grouping
2016-01-13 16:48:49 +00:00
Matthias Radestock