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
Adam Harrison
5de090999c
Fix broken link
2016-04-26 17:29:34 +01:00
Adam Harrison
8ea5d999c2
Disable dry run mode
2016-04-26 17:29:26 +01:00
Adam Harrison
671dddf761
Merge pull request #2212 from weaveworks/issues/2114-wordepress-circleci
...
Incrementally publish 1.5 branch doc updates directly to live
2016-04-26 17:06:14 +01:00
Adam Harrison
f4a117a8fc
Enable dry run mode
2016-04-26 16:46:04 +01:00
Bryan Boreham
8fdbaf5745
Merge branch '1.5'
2016-04-26 15:43:12 +01:00
Bryan Boreham
0e655a2bbd
Remove plugin-connected containers before end of test, to avoid delaying later cleanup.
...
Also use a shorter sequence to exclude the plugin when removing other containers.
2016-04-26 15:42:35 +01:00
Bryan Boreham
15054393fb
Update profile package to latest version
2016-04-26 14:57:04 +01:00
Bryan Boreham
f56d001703
Updated vendored libraries:
...
vendor/github.com/Sirupsen/logrus to latest release 0.10.0
vendor/github.com/appc/cni to latest master
vendor/github.com/boltdb/bolt to latest release 1.2.0
vendor/github.com/coreos/go-iptables to latest release 0.1.0
vendor/github.com/fsouza/go-dockerclient to latest master
vendor/github.com/docker/docker to latest release 1.11.0
vendor/github.com/docker/libnetwork to v0.7.0-dev.6 matching docker 1.11.0
vendor/github.com/docker/machine to latest release v0.7.0
vendor/github.com/google/gopacket to latest master
vendor/github.com/gorilla/context to latest release 1.1
vendor/github.com/gorilla/mux to latest release 1.1
vendor/github.com/hashicorp/go-cleanhttp to latest master
vendor/github.com/miekg/dns to latest master
vendor/github.com/opencontainers/runc to latest release 0.1.0
vendor/github.com/stretchr/testify unchanged at 1.1.3
vendor/github.com/vishvananda/netlink to latest master
vendor/github.com/vishvananda/netns to latest master
vendor/github.com/weaveworks/go-checkpoint unchanged; already at latest on master
vendor/github.com/weaveworks/go-odp to latest master
vendor/github.com/weaveworks/mesh to latest master
vendor/golang.org/x/crypto to latest master
2016-04-26 14:19:29 +01:00
Matthias Radestock
6ac248bfbf
Merge branch '1.5'
2016-04-26 14:08:21 +01:00
Matthias Radestock
a5739e8753
make plugin README link to other docs on github rather than website
...
until we have stable (non-version-specific) links for the latter.
Stop-gap for #2214 .
2016-04-26 14:06:40 +01:00
Adam Harrison
79f2324d2b
Update release process
2016-04-26 12:04:28 +01:00
Anita Buehrle
c1a3ea925d
Updated IPAM title and added punctuation
2016-04-26 10:10:41 +01:00
Adam Harrison
062c7a6fdc
Minor doc fixes for incremental publish
2016-04-25 17:30:51 +01:00
Adam Harrison
6cc7f37dbb
Publish /site from CI
2016-04-25 17:30:51 +01:00
Bryan Boreham
76601fed09
Fix up merge in unit test
2016-04-25 12:28:47 +01:00
Bryan Boreham
88a044f7f9
Merge pull request #2184 from weaveworks/2181-excessive-ring-frag
...
prevent excessive ring fragmentation due to repeated space requests. Fixes #2181
2016-04-25 11:54:12 +01:00
Matthias Radestock
03fcbbceb9
add CONTRIBUTING.md
2016-04-24 19:55:23 +01:00
Matthias Radestock
cec88f154e
Merge pull request #2205 from weaveworks/issues/2057-gc-nicknames
...
Add allocator.PeerGone
Fixes #2057
2016-04-22 17:42:43 +01:00
Martynas Pumputis
849edb1768
Add allocator.PeerGone
...
The function is registered within the mesh gc and it is responsible
for removing gone nicknames (#2057 ).
2016-04-22 17:29:27 +01:00
Bryan Boreham
981b78f680
Merge pull request #2203 from weaveworks/issues/2197-add-equals
...
Add equals sign to --dns arg, for consistency
2016-04-22 14:39:18 +01:00
Bryan Boreham
ee75d91756
Merge branch '1.5'
2016-04-22 14:37:25 +01:00
Bryan Boreham
d2450aae1c
Merge pull request #2204 from weaveworks/issues/2193-dns-leak
...
Fixes #2123 : Use ContainerID when restarting a container
2016-04-22 14:36:17 +01:00
Bryan Boreham
b4f35f1d38
Add equals sign to --dns arg, for consistency
2016-04-22 11:16:58 +01:00