Matthias Radestock
752baa4bd6
remove unnecessary WEAVE_CIDR=none
...
since the router is now always running with --net=host
2016-02-26 13:58:06 +00:00
Matthias Radestock
6cbde89eeb
refactor: consistency in specification of common docker run options
2016-02-26 13:57:37 +00:00
Adam Harrison
c5361801c9
Fix typo in weaver CLI help
2016-02-25 12:02:28 +00:00
Matthias Radestock
3283bc89fc
Merge branch '1.4'
2016-02-23 13:56:56 +00:00
Matthias Radestock
26519333c0
cosmetic: correct comment
2016-02-23 13:36:56 +00:00
Matthias Radestock
639cde0f67
refactor: inline
2016-02-23 13:34:14 +00:00
Matthias Radestock
6a9f9f66dc
don't check for 'Restarting' when attaching on startup
...
It is overkill.
2016-02-23 13:20:22 +00:00
Adam Harrison
639e0e82c9
Merge pull request #1989 from weaveworks/1977-restarting-not-running
...
treat 'restarting' as 'not running'
2016-02-23 10:49:31 +00:00
Adam Harrison
6f65512471
Merge branch '1.4'
2016-02-23 10:47:08 +00:00
Adam Harrison
4b0a6e1433
Merge pull request #1983 from weaveworks/1929-auto-detect-odp-on-relaunch
...
don't complain on relaunch when ODP is not supported
2016-02-23 10:46:36 +00:00
Matthias Radestock
d5b82cac45
Merge branch '1.4'
2016-02-23 10:17:03 +00:00
Matthias Radestock
cb6db91b09
Merge branch 'latest_release_doc_updates' into 1.4
2016-02-23 10:16:08 +00:00
Matthias Radestock
6a02e2dc17
explain TCP/UDP connections, heartbeats, back-off
...
Fixes #1969
2016-02-23 09:54:15 +00:00
Ilya Dmitrichenko
f4ad97b0c9
Merge branch '1.4'
2016-02-22 14:16:37 +00:00
Ilya Dmitrichenko
b377207faf
Merge branch 'latest_release_doc_updates' into 1.4
2016-02-22 14:16:02 +00:00
Ilya Dmitrichenko
24ebb7cc7c
Add missing dependency for latest gsutil
2016-02-22 14:11:36 +00:00
Ilya Dmitrichenko
b5518db03c
Add missing argument to tar
2016-02-22 14:02:39 +00:00
Ilya Dmitrichenko
2aa4e6a83a
Use "official" gsutil installation instructions
2016-02-22 13:58:42 +00:00
Ilya Dmitrichenko
7c655cc3ba
Fix false-positive docs uploads
2016-02-22 13:56:49 +00:00
Matthias Radestock
d7a1bdd7a8
Merge branch '1.4'
2016-02-22 13:55:45 +00:00
Matthias Radestock
75cda01167
Merge branch 'latest_release_doc_updates' into 1.4
2016-02-22 13:55:18 +00:00
Matthias Radestock
4f0f3cf98d
warn against using the plugin in combination with --net=weave
...
and expand the basic proxy usage docs slightly.
2016-02-22 13:53:39 +00:00
Matthias Radestock
d9637ce620
Merge branch '1.4'
2016-02-22 13:38:08 +00:00
Matthias Radestock
e014140134
Merge branch 'latest_release_doc_updates' into 1.4
2016-02-22 13:36:33 +00:00
Matthias Radestock
c8ae128e59
for Travis, this no longer is a go project
...
Travis insists that one picks a project language. There is no go left
in the steps executed by travis. Instead we have Python, Ruby and
shell. Let's pick the first...
Picking Python makes travis unhappy with "Can not perform a '--user'
install. User site-packages are not visible in this
virtualenv". Dropping the '--user' flag fixes that.
(cherry picked from commit 1d8d098450
2016-02-22 13:29:33 +00:00
Matthias Radestock
12d848162d
shrink Travis usage
...
There is no point running builds, tests, lints on Travis, since we
already do that on Circle.
The only thing we aren't doing (and can't do) on Circle is doc
publishing, so now Travis does just that.
(cherry picked from commit 1038cbd1a3
2016-02-22 13:29:33 +00:00
Matthias Radestock
b12096bd6c
tweak
2016-02-22 13:23:29 +00:00
Matthias Radestock
644485d4ae
Merge branch '1.4'
2016-02-22 13:13:48 +00:00
Matthias Radestock
1430982166
Merge branch 'latest_release_doc_updates' into 1.4
2016-02-22 13:13:13 +00:00
Matthias Radestock
2a83aad1d6
warn against using plugin and proxy simultaneously
...
and give a complete example.
Partially addresses #1988 .
2016-02-22 13:11:02 +00:00
Matthias Radestock
4a7157959a
don't attempt to attach 'restarting' containers
...
this is an optimisation... there is no point attempting to attach a
'restarting' container - it will fail.
When the container *actually* restarts we'll get a 'Start' event, and
attach at that point.
Also, there is no point checking for 'Paused' since 'Paused' ->
'Running'.
2016-02-20 11:00:04 +00:00
Matthias Radestock
e52abafc48
treat restarting containers as "not running"
...
thus preventing stale DNS & IPAM entries.
Fixes #1977
2016-02-20 10:59:47 +00:00
Matthias Radestock
0f9d9c77a3
remove cruft
2016-02-19 00:30:22 +00:00
Matthias Radestock
33c81add8d
update dependency to fix build breakage
2016-02-19 00:27:45 +00:00
Matthias Radestock
ee531b8023
don't complain on relaunch when ODP is not supported
...
...and WEAVE_NO_FASTDP isn't set.
Fixes #1929 .
2016-02-18 22:00:08 +00:00
Matthias Radestock
497a104db7
Merge branch '1.4'
2016-02-18 21:59:42 +00:00
Matthias Radestock
5e761a62b0
Merge pull request #1985 from weaveworks/issues/1984-discovery
...
Add two functions required by ipamapi "contract"
Fixes #1984
2016-02-18 21:55:53 +00:00
Bryan Boreham
b442567406
Add two functions required by ipamapi "contract" but not actually used
2016-02-18 15:29:10 +00:00
Adam Harrison
5dd8584fb6
Fix veth cleanup on Ubuntu 15.10
...
Cope with the @ characters that have started appearing in veth names as
of Ubuntu 15.10.
2016-02-18 12:11:48 +00:00
Matthias Radestock
4bd18737b7
fix typo
2016-02-18 11:39:54 +00:00
Matthias Radestock
09cd9e091a
Merge branch '1.4'
2016-02-16 14:09:06 +00:00
Matthias Radestock
17d53af2a2
improve logging of dns entry creation
...
- log inside the lock, so we get proper serialisation
- include the container name, so we can identify the specific entry
2016-02-16 14:04:34 +00:00
Adam Harrison
2d4d3577ba
Merge pull request #1971 from weaveworks/issues/678-persist-ipam2
...
Persist IPAM ring
2016-02-15 10:15:53 +00:00
Bryan Boreham
546f9592f9
Hard-fail on persistence errors, otherwise the network can get confused on a restart.
...
Create `Allocator.fatalf()`, for consistency
2016-02-12 18:12:26 +00:00
Bryan Boreham
06f3793f05
Remove persisted IPAM ring data on peerName change
2016-02-12 18:12:26 +00:00
Bryan Boreham
f396c60402
Persist the Ring
2016-02-12 18:12:26 +00:00
Bryan Boreham
ad036499eb
Add db infra to IPAM
2016-02-12 18:12:26 +00:00
Bryan Boreham
38c6eb28e8
Add basic infrastructure to use BoltDB for persistence
2016-02-12 18:12:26 +00:00
Matthias Radestock
11e2515f70
Merge pull request #1968 from weaveworks/refactor-veth-creation
...
"refactor" veth creation
2016-02-10 13:49:13 +00:00
Matthias Radestock
c79e036c08
Merge pull request #1966 from weaveworks/issues/1965-fix-local-weave-ps
...
Make weaveutil container-addrs observe $PROCFS
Fixes #1965 .
2016-02-09 22:40:36 +00:00
Matthias Radestock