Matthias Radestock
bd6359dcb1
Merge branch '1.4'
2016-03-29 05:38:35 +01:00
Matthias Radestock
cc75b084d8
Merge branch 'latest_release_doc_updates' into 1.4
2016-03-29 05:36:59 +01:00
Matthias Radestock
bd9314939b
correct weave status proxy output
2016-03-29 05:36:11 +01:00
Anita Buehrle
2298927331
Merge pull request #2103 from weaveworks/spellcheck
...
fixed formatting for wp and spellcheck
2016-03-28 16:27:24 -06:00
Anita Buehrle
b3b93b28df
fixed formatting for wp and spellcheck
2016-03-28 16:30:33 -06:00
Matthias Radestock
d68c1a8187
correct tools submodule reference
...
This got broken in 18f678a3c8
2016-03-28 18:09:08 +01:00
Matthias Radestock
06a525456d
remove bogus link
2016-03-28 17:59:16 +01:00
Matthias Radestock
9d19676ef1
cosmetic(ish): add reference to crypto overview from implementation
2016-03-28 17:58:43 +01:00
Matthias Radestock
540b55a35c
cosmetic(ish): add some references to crypto docs
2016-03-28 17:53:41 +01:00
Matthias Radestock
2f435cfcce
fix/add links to examples when referring to them
2016-03-28 17:44:43 +01:00
Matthias Radestock
18f678a3c8
Merge branch '1.4'
2016-03-28 17:32:22 +01:00
Matthias Radestock
cc06a2d8ab
Merge branch 'latest_release_doc_updates' into 1.4
2016-03-28 17:24:51 +01:00
Matthias Radestock
1dd2cdf7a9
fix dns load balancing example
2016-03-28 17:24:08 +01:00
Matthias Radestock
5944f069b6
cosmetic: quoting consistency
2016-03-28 16:55:19 +01:00
Matthias Radestock
aade206f22
cosmetic(ish): ungarble example
2016-03-28 16:53:07 +01:00
Matthias Radestock
22c3582699
cosmetic: tweak example links
2016-03-28 16:27:21 +01:00
Matthias Radestock
2948deb210
cosmetic: tweak link
2016-03-28 16:25:12 +01:00
Matthias Radestock
db9139a0cd
correct weave attach example
2016-03-28 16:03:20 +01:00
Matthias Radestock
bbcbb5f7b8
fix more doc typos
2016-03-28 15:56:27 +01:00
Matthias Radestock
1a872f3895
fix a bunch of typos
2016-03-28 15:45:05 +01:00
Matthias Radestock
095d7e54c3
fix typo
2016-03-28 15:24:17 +01:00
Matthias Radestock
0672a0858f
Merge branch '1.4'
2016-03-28 12:52:31 +01:00
Matthias Radestock
a1381fe0cf
add --no-dns to usage
...
Closes #1687 .
2016-03-28 12:49:31 +01:00
Matthias Radestock
3baf8058ed
Merge branch 'latest_release_doc_updates' into 1.4
2016-03-28 12:48:36 +01:00
Matthias Radestock
daf92d8e08
document --no-dns
...
Part of #1687 .
2016-03-28 12:46:58 +01:00
Matthias Radestock
c91b2c2907
Merge remote-tracking branch 'upstream/master'
2016-03-28 11:37:24 +01:00
Matthias Radestock
6e0aea233b
Merge branch '1.4'
2016-03-28 11:36:18 +01:00
Matthias Radestock
abd138026b
cosmetic: identation
2016-03-28 11:10:36 +01:00
kpoplin
3b9847d5d9
Update README.md
...
Updated the "About Weaveworks" section to differentiate between our overall mission and a Weave Net-specific overview; also included brief descriptions of Weave Scope and Weave Flux. Corrected product names missed in last update.
2016-03-27 07:25:14 -07:00
kpoplin
c4ec25bb14
Update README.md
...
Updated for consistent pronoun usage; corrected product and company references, following our standardized naming conventions; fixed other minor grammatical errors.
2016-03-27 06:49:28 -07:00
Matthias Radestock
0109bf0ac7
tiny refactor: make function & const name more meaningful
2016-03-26 21:23:23 +00:00
Matthias Radestock
91044ac0fa
cosmetic: consistency
2016-03-24 18:51:08 +00:00
Matthias Radestock
98aeb674c4
cosmetic: more plugin error message/logging tweaks
2016-03-24 18:41:47 +00:00
Matthias Radestock
ea11c5eedc
cosmetic: some error logging message tweaks
2016-03-24 18:16:57 +00:00
Matthias Radestock
c146ee142d
Merge branch '1.4'
2016-03-24 17:26:00 +00:00
Bryan Boreham
88d115aab1
Merge pull request #2098 from weaveworks/2097-fail-on-attach-errors
...
fail plugin operation on bridge attachment error
2016-03-24 17:16:55 +00:00
Matthias Radestock
fce954192c
fail plugin operation on bridge attachment error
...
Fixes #2097 .
2016-03-24 17:01:15 +00:00
Bryan Boreham
aab86c38b7
Merge pull request #2093 from weaveworks/tools
...
Update tools to get misspell integration. Aho-Corasick FTW!
2016-03-24 14:09:45 +00:00
Bryan Boreham
adc038d8d1
Merge pull request #2095 from berlic/berlic-plugin-docker-args
...
Support custom docker args for weave-plugin
2016-03-24 12:53:10 +00:00
Adam Harrison
7776e48a62
Merge branch '1.4'
2016-03-23 18:00:38 +00:00
Adam Harrison
6c0075ab82
Add release v1.4.6
2016-03-23 17:37:21 +00:00
Matthias Radestock
48534b1e30
unbreak tests
...
Broken in an attempt to help with #2090 .
2016-03-23 17:22:40 +00:00
Matthias Radestock
8b6c5bdae4
unbreak things
2016-03-23 17:05:19 +00:00
Matthias Radestock
b8abb22833
Merge branch '1.4'
2016-03-23 16:39:17 +00:00
Matthias Radestock
ae0a4fef50
Merge pull request #2092 from weaveworks/issues/2083-error-not-panic
...
Change invariant fail on Merge() from panic to error
Fixes #2083 .
2016-03-23 16:38:52 +00:00
Matthias Radestock
4dcec8265d
Merge branch '1.4'
...
(but really replace all the changes, which were in 'mesh', with
vendoring the latest mesh)
2016-03-23 16:30:28 +00:00
Matthias Radestock
8360024e06
Merge pull request #2088 from weaveworks/issues/2087-leave-direct-targets
...
Don't delete targets that seem invalid if they are 'direct' targets
Fixes #2087 .
2016-03-23 16:22:08 +00:00
Tom Wilkie
7a7867ae16
Fix spelling mistakes.
2016-03-23 16:09:43 +00:00
Tom Wilkie
43f8d073db
Update tools for misspell.
2016-03-23 16:05:13 +00:00
Bryan Boreham
2e4d56efd6
Suspend connecting to targets that seem invalid, if they are 'direct' targets.
...
Introduce TargetSuspended state to reflect this.
2016-03-23 15:36:55 +00:00
Matthias Radestock