Commit Graph
4566 Commits
Author SHA1 Message Date
Anita Buehrle 8a305ee189 fixes #2102 2016-03-30 17:05:26 -06:00
Matthias Radestock 254be128b0 cosmetic: consistency 2016-03-30 16:25:26 +01:00
Matthias Radestock 2c49cd1e0a refactor: s/DOCKERPLUGIN/PLUGIN
since it's also a CNI plugin now
2016-03-30 15:43:55 +01:00
Matthias Radestock 90629bc6d3 add another cross reference. 2016-03-30 00:03:55 +01:00
Matthias Radestock c6fea4939e fix broken link 2016-03-30 00:02:30 +01:00
Anita Buehrle 0597162189 Merge pull request #2111 from weaveworks/app-isolation-fix
sorted out isolated apps files
2016-03-29 16:42:29 -06:00
Anita Buehrle 74e7d383c9 sorted out isolated apps files 2016-03-29 16:45:20 -06:00
Adam Harrison 051320e73c Merge branch '1.4' 2016-03-29 11:45:24 +01:00
Adam Harrison 6e04ccf677 Merge pull request #2101 from weaveworks/2099-no-dns
make `weave dns-args` and `weave run` work with `--no-dns`
2016-03-29 11:44:12 +01:00
Adam Harrison 436dc01f52 Merge pull request #2070 from weaveworks/issues/1721-quorum-callback
Use current target list to compute quorum
2016-03-29 11:11:30 +01:00
Adam Harrison a6bb02aca1 Merge pull request #2106 from weaveworks/patch-up-2103
Patch up #2103
2016-03-29 10:37:04 +01:00
Matthias Radestock ec5008c702 remove "quote of quote" 2016-03-29 10:31:36 +01:00
Matthias Radestock 3453972ac4 banish ~~~bash
Just use indenting, which is much easier on the eye.
2016-03-29 10:30:51 +01:00
Adam Harrison 7c37cd98dd Merge pull request #2074 from weaveworks/cleanup-plugin-logging
clean up plugin logging
2016-03-29 10:02:21 +01:00
Matthias Radestock a1eb940c51 restore ellipses around weave status output fragments 2016-03-29 05:40:50 +01:00
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 b2a484d5f0 refactor: inline 2016-03-28 14:17:54 +01:00
Matthias Radestock 8472272afe refactor(ish): bail early if weaveDNS is disabled 2016-03-28 14:10:31 +01:00
Matthias Radestock 648632d5ac add a test for working with --no-dns 2016-03-28 14:07:48 +01:00
Matthias Radestock ea3456756d make weave dns-args and weave run work with --no-dns
...rather than exploding

i.e. the former returns nothing and the latter leaves naming related
container settings untouched, just like happens in the proxy and
plugin.

Fixes #2099.
2016-03-28 14:04:07 +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