Tom Wilkie
a0982cb5e5
Merge pull request #2005 from weaveworks/sudo
...
Autodetect if we talk to docker via tcp in the Makefile
2016-05-05 10:05:56 +01:00
Tom Wilkie
0314a86e03
Autodetect if we talk to docker via tcp in the Makefile
2016-05-04 16:28:28 +01:00
Bryan Boreham
d9d038ae35
Merge branch '1.5'
2016-05-04 15:38:33 +01:00
Bryan Boreham
87b61419f3
Move plugin arguments from separate doc into main plugin doc and add table of contents with sub-heading anchors
2016-05-04 14:44:10 +01:00
Adam Harrison
5fb6df5219
Merge branch '1.5'
2016-05-04 13:34:06 +01:00
Matthias Radestock
b6647741b5
Merge pull request #2162 from weaveworks/issues/2034-log-rest-api
...
Add LogHandler for logging REST API calls at server side
Fixes #2034
2016-05-04 12:39:11 +01:00
Adam Harrison
0b4f9dbcf9
Merge pull request #2255 from weaveworks/issues/wordepress-stable-urls
...
Upgrade release branch doc publishing to wordepress 1.0.0
2016-05-04 11:59:22 +01:00
Martynas Pumputis
9644ed3f29
Merge pull request #2196 from weaveworks/issues/2194-claim-addr
...
Improve handling of `claim _`
2016-05-04 11:22:04 +01:00
Adam Harrison
1d52615452
Pin all branches to Wordepress 1.0.0
2016-05-04 11:07:12 +01:00
Adam Harrison
327a6f6d61
Upgrade to Wordepress 1.0.0
...
Release docs will now also be available with a stable 'latest' URL.
2016-05-04 11:01:07 +01:00
Adam Harrison
7aee9ebf84
Merge pull request #2254 from weaveworks/issues/wordepress-stable-urls
...
Upgrade to Wordepress 1.0.0
2016-05-04 10:56:34 +01:00
Adam Harrison
8f6087cfec
Upgrade to Wordepress 1.0.0
...
Release docs will now also be available with a stable 'latest' URL.
2016-05-04 10:30:18 +01:00
Matthias Radestock
6022ad467a
Merge branch '1.5'
2016-05-03 17:56:46 +01:00
Matthias Radestock
05652c0a3c
Merge pull request #2252 from weaveworks/issues/2244-dns-noerror
...
Blank DNS response to AAAA queries where we have an A record
Fixes #2244 .
2016-05-03 17:55:37 +01:00
Bryan Boreham
503546d2a9
Return DNS no-error with empty answer if we have a matching name
...
but the query is for a record type we don't support.
2016-05-03 17:33:51 +01:00
Bryan Boreham
70bd0ade45
Identifier "_" is address, not cidr
2016-05-03 15:47:45 +01:00
Martynas Pumputis
9dd1fbba39
Add LoggingHTTPHandler for logging REST requests at the server-side
2016-05-03 15:40:37 +01:00
Adam Harrison
bcc9a85e29
Merge remote-tracking branch 'origin/1.5'
2016-05-03 14:27:51 +01:00
Adam Harrison
be3b0aa976
Merge pull request #2247 from weaveworks/pin-wordepress-version
...
Pin wordepress version used to publish site
2016-05-03 14:13:03 +01:00
Adam Harrison
68e5ed575f
Pin wordepress version
...
Use specific versions of wordepress for live and dev publishing
2016-05-03 13:47:37 +01:00
Bryan Boreham
bd23c79823
Merge branch '1.5'
2016-04-29 21:11:12 +01:00
Bryan Boreham
393fa3a333
Remove obsolete option and add --no-restart option
2016-04-29 19:49:21 +00:00
Bryan Boreham
27bdd3b4ad
Revert "Log the error when something goes wrong requesting a claimed address"
...
This reverts commit 14bc1c987e .
2016-04-29 16:03:41 +01:00
Bryan Boreham
14bc1c987e
Log the error when something goes wrong requesting a claimed address
2016-04-29 16:01:21 +01:00
Bryan Boreham
fd7fcc762e
Clarify the function of the periodic ticker.
...
- it either retries for consensus or retries operations we would have tried previously.
There is no point retrying pending operations if we are waiting for consensus.
2016-04-29 13:59:25 +01:00
Matthias Radestock
03afb54cdd
remove cruft
2016-04-29 10:03:23 +01:00
Bryan Boreham
50e114863d
Merge branch '1.5'
2016-04-28 09:40:04 +00:00
Bryan Boreham
9ce229ba3a
Merge pull request #2202 from weaveworks/issues/1482-update-test320
...
Update test 320 to cope with persistence
2016-04-28 10:21:57 +01:00
Adam Harrison
e6f031a3c9
Merge pull request #2218 from weaveworks/1.6-upgradeathon
...
Upgrade vendored libs
2016-04-28 10:13:44 +01:00
abuehrle
8b432a4d3e
fixed broken links
2016-04-27 15:16:45 -05:00
Matthias Radestock
818f3e284b
Merge branch '1.5'
2016-04-27 20:29:38 +01:00
Matthias Radestock
560f38330e
Merge pull request #2230 from weaveworks/tweak-using-titles
...
Tweak titles under "Using Weave Net"
2016-04-27 20:17:04 +01:00
Matthias Radestock
5771ba15dd
Merge branch '1.5'
2016-04-27 19:37:22 +01:00
abuehrle
9243bc2b0a
fixed broken links
2016-04-27 13:25:32 -05:00
Matthias Radestock
df5d6972e1
Tweak titles under "Using Weave Net"
...
- strip "Weave" and "Weave Net"
- "Integrating a Host Network with Weave" -> "Integrating with the
Host Network"
- "Configuring Weave to Explicitly Use an IP Range" -> "Allocating IPs
in a Specific Range"
2016-04-27 19:21:02 +01:00
Matthias Radestock
380cb9b0fc
Merge pull request #2228 from weaveworks/tweak-using-sections
...
tweak 'Using Weave Net' section order
2016-04-27 18:50:14 +01:00
Matthias Radestock
bd3b3791c6
tweak 'Using Weave Net' section order
...
- move "Managing Services in Weave Net" up so it comes after
"Integrating a Host Network with Weave Net", to which it is deeply
related
- move "Adding and Removing Hosts Dynamically" down so it is adjacent
to the other sections which talk about peer connectivity
2016-04-27 18:37:28 +01:00
Matthias Radestock
77ced2ac55
Merge branch '1.5'
2016-04-27 18:25:23 +01:00
Matthias Radestock
7decce690a
Merge pull request #2227 from weaveworks/2207-dedup-service-export-docs
...
dedup service export docs
Fixes #2207 .
2016-04-27 17:31:34 +01:00
Matthias Radestock
65ecac6f1a
cosmetic: consistency
2016-04-27 11:54:23 +01:00
Matthias Radestock
14a3898371
remove service-export doc since it duplicates content
...
...and update links accordingly.
2016-04-27 11:53:03 +01:00
Matthias Radestock
c012650476
make service export section match whats in the separate doc
2016-04-27 11:48:56 +01:00
Adam Harrison
d5fd62393f
Merge branch '1.5'
2016-04-27 10:00:21 +01:00
Adam Harrison
789a6192f2
Merge pull request #2221 from weaveworks/issues/2216-fix-link
...
Fix broken link
2016-04-27 09:32:26 +01:00
Matthias Radestock
298fdc3d58
Merge branch '1.5'
2016-04-27 08:40:58 +01:00
Matthias Radestock
019a065d03
refactor: more logical question ordering
2016-04-27 08:40:07 +01:00
Matthias Radestock
de1304d424
fix typo
2016-04-27 08:39:23 +01:00
Matthias Radestock
ef915ca58f
cosmetic: consistent formatting of FAQ questions
2016-04-27 08:36:25 +01:00
Matthias Radestock
72e134605c
refactor: move pure code outside actor
2016-04-26 20:02:47 +01:00
Matthias Radestock
7cc2a1fe38
refactor: more descriptive function name
2016-04-26 17:33:04 +01:00