Matthias Radestock
70bfcd033b
Merge branch '1.4'
2016-01-04 11:14:28 +00:00
Matthias Radestock
80770d39e5
oops
2016-01-04 10:53:41 +00:00
Matthias Radestock
beb15fa32c
don't fail weave launch when plugin is disabled
...
Fixes #1851 .
2016-01-04 10:35:44 +00:00
Matthias Radestock
1bec425510
Merge branch '1.4'
2016-01-04 09:46:35 +00:00
Matthias Radestock
0adf7626d0
Merge branch 'latest_release_doc_updates' into 1.4
2016-01-04 09:45:56 +00:00
Matthias Radestock
9c17fe259c
add ToC to build instructions
2016-01-04 09:41:39 +00:00
Matthias Radestock
ecab4b4716
correct image names
2016-01-04 09:35:17 +00:00
Matthias Radestock
c3e6669d18
Merge branch '1.4'
2016-01-03 16:45:41 +00:00
Matthias Radestock
7660ad761a
oops
...
I broke this in 370212609Fixes #1848 .
2016-01-03 16:42:39 +00:00
Matthias Radestock
79452d3a9a
cosmetic(ish)
2016-01-02 14:00:23 +00:00
Matthias Radestock
0ee22af32d
refactor: further simplify fastdp initialisation
2016-01-02 13:17:40 +00:00
Matthias Radestock
13f37edb64
refactor: simplify fastdp initialisation
2016-01-02 13:17:28 +00:00
Matthias Radestock
75d9e95b15
appease linter
2016-01-02 12:35:10 +00:00
Matthias Radestock
d59594c6b0
Revert "refactor: pass procfs location to docker_tls_args on command line"
...
changed my mind
This reverts commit be8260ae79
2016-01-02 10:50:13 +00:00
Matthias Radestock
4a6b72c649
Revert "cosmetic"
...
changed my mind
This reverts commit 20a8488a15
2016-01-02 10:49:22 +00:00
Matthias Radestock
20a8488a15
cosmetic
...
PROCFS is always set
2016-01-02 00:14:18 +00:00
Matthias Radestock
be8260ae79
refactor: pass procfs location to docker_tls_args on command line
...
...rather than via an env var. This is cleaner.
2016-01-01 23:52:46 +00:00
Matthias Radestock
9c31de9cb9
refactor: replace some 'if's with && and || expressions
2015-12-31 15:36:18 +00:00
Matthias Radestock
c1e8c9c537
Merge branch '1.4'
2015-12-31 13:26:55 +00:00
Matthias Radestock
c8ff2de3b3
properly deal with unavailable docker server api version
...
Fixes #1845 .
2015-12-31 12:51:16 +00:00
Matthias Radestock
24d1c73012
Merge branch '1.4'
2015-12-31 12:32:30 +00:00
Matthias Radestock
24a2e43547
Merge pull request #1841 from weaveworks/1840-weave-stop-plugin-complaint
...
don't complain in `weave stop` when plugin is not enabled
Fixes #1840 .
2015-12-31 12:32:05 +00:00
Matthias Radestock
2816899543
refactor: extract helper to invoke fastdp functions from script
2015-12-31 12:19:51 +00:00
Matthias Radestock
394d2add68
Merge branch '1.4'
2015-12-31 10:59:10 +00:00
Matthias Radestock
a9d212c888
don't fail on missing docker_tls_args
...
instead just don't auto-detect TLS args in that case.
This makes `weave --local launch` work (again).
Fixes #1844 .
2015-12-31 10:43:46 +00:00
Matthias Radestock
c1b1276aaf
refactor: simplify
2015-12-31 10:16:37 +00:00
Matthias Radestock
370212609c
Show expected error message when docker_tls_args fails.
...
And also make the error message more meaningful.
Fixes #1843 .
2015-12-31 10:05:41 +00:00
Matthias Radestock
159bad54b0
prettier usage
2015-12-31 01:42:01 +00:00
Matthias Radestock
1cc7ca18ba
Merge branch '1.4'
2015-12-31 01:11:06 +00:00
Matthias Radestock
281937cf82
document weave launch-router --trusted-subnets
...
and eliminate duplication
Fixes #1842 .
2015-12-31 01:09:51 +00:00
Matthias Radestock
d11b6e8075
don't complain in weave stop when plugin is not enabled
2015-12-30 23:40:27 +00:00
Matthias Radestock
4e22922256
refactor: rename netcheck.go -> main.go, for consistency
2015-12-30 23:17:48 +00:00
Matthias Radestock
8f01f6e85c
make some rules more generic, depending on *.go instead of main.go
2015-12-30 23:14:53 +00:00
Matthias Radestock
27f477a075
refactor: introduce a small helper so we don't repeat ourselves
2015-12-30 22:40:30 +00:00
Matthias Radestock
82ac69be4e
cosmetic
2015-12-30 22:23:16 +00:00
Matthias Radestock
0f357cdf7c
Merge branch '1.4'
2015-12-30 20:27:18 +00:00
Matthias Radestock
7709c6d0bd
Merge branch 'latest_release_doc_updates' into 1.4
2015-12-30 20:26:06 +00:00
Matthias Radestock
ef3e478506
Merge pull request #1804 from weaveworks/1774-trouble
...
Update 'reboots' info
Fixes #1774 .
2015-12-30 19:51:09 +00:00
Matthias Radestock
93eef26d0b
reword
2015-12-30 19:38:13 +00:00
Matthias Radestock
14d78cf08c
Update 'reboots' info
2015-12-30 19:32:18 +00:00
Matthias Radestock
872d88acb6
Merge branch '1.4'
2015-12-30 19:14:51 +00:00
Matthias Radestock
e96a63f550
Merge branch 'latest_release_doc_updates' into 1.4
2015-12-30 19:14:33 +00:00
Matthias Radestock
7a5b69f850
cosmetic
2015-12-30 19:13:57 +00:00
Matthias Radestock
a71d2a1682
move things around on troubleshooting page
...
- level 2 headings for top-level instead of level 3
- put all status reporting as L3s under one L2 heading
- add 'Reboots' to ToC
- move 'Stopping weave' into its own section and and move that
2015-12-30 19:06:04 +00:00
Matthias Radestock
f0f0e6f36d
reword "Contact Us"
2015-12-30 18:37:57 +00:00
Matthias Radestock
6ecdf69b88
replace partially broken link soup
2015-12-30 17:42:49 +00:00
Matthias Radestock
58de14ff65
optimisation: don't re-assign our ShortID if nothing got gc'ed
2015-12-30 14:07:23 +00:00
Matthias Radestock
0ecc0ee02e
tiny refactor
2015-12-30 12:07:56 +00:00
Matthias Radestock
8101dea338
remove some noisy logging
2015-12-24 21:25:25 +00:00
Matthias Radestock
373f8a4463
oops
2015-12-24 21:23:35 +00:00
Matthias Radestock