Martynas Pumputis
f7bddab4cb
Merge branch '1.5'
2016-05-10 15:27:15 +01:00
Martynas Pumputis
c434345960
Fix typo
2016-05-10 15:24:38 +01:00
Martynas Pumputis
f9157acced
Fix logging
2016-05-10 15:18:10 +01:00
Adam Harrison
0e694ed6b4
Merge branch '1.5'
2016-05-09 16:37:05 +01:00
Adam Harrison
9dfd7004cc
Document adding new version to checkpoint API
2016-05-09 16:36:32 +01:00
Bryan Boreham
cf6d0c8126
Merge branch '1.5'
2016-05-09 15:48:20 +01:00
Bryan Boreham
3963d4453a
Remove mention of obsolete branch latest_release_doc_updates
2016-05-09 15:48:05 +01:00
Bryan Boreham
99b0b949e8
Merge branch '1.5'
2016-05-09 15:40:12 +01:00
Bryan Boreham
ce5d2a6dd0
Add release v1.5.1
2016-05-09 15:16:21 +01:00
Adam Harrison
801283267a
Merge branch '1.5'
...
Closes #1876 .
2016-05-09 14:58:28 +01:00
Bryan Boreham
a2e301c648
Merge pull request #2263 from weaveworks/issues/1876-weave-status-ipam-docs
...
Document `weave status ipam`. Fixes #1876 .
2016-05-09 14:56:59 +01:00
Bryan Boreham
2249c7c648
Merge branch '1.5'
2016-05-09 14:46:06 +01:00
Bryan Boreham
0425d5bf6a
Removed duplicated 'name'
2016-05-09 14:45:43 +01:00
Bryan Boreham
de9597b6fa
Merge branch '1.5'
2016-05-09 14:38:00 +01:00
Bryan Boreham
2fa576f3c0
Merge pull request #2265 from weaveworks/issues/2232-block-claim
...
Make claim block if the IPAM ring is not established. Fixes #2232
2016-05-09 14:37:37 +01:00
Adam Harrison
fa29a4b4af
Document weave status ipam
2016-05-09 13:41:42 +01:00
Martynas Pumputis
d698aefbfc
Make Claim to block if the IPAM ring is not established
2016-05-09 12:48:41 +01:00
Matthias Radestock
db1ac2a343
Merge branch '1.5'
2016-05-09 11:50:09 +01:00
Matthias Radestock
a3b6380296
Merge pull request #2264 from weaveworks/issues/2123-die-another-way
...
Kill process instead of container, on container restart.
Fixes #2123
2016-05-09 11:47:58 +01:00
Bryan Boreham
469d456c8b
Smoke-test for container restart with proxy attach failure
2016-05-09 11:19:19 +01:00
Matthias Radestock
438efcccda
Merge branch '1.5'
2016-05-07 20:19:18 +01:00
Matthias Radestock
daa369b86c
refactor: extract a couple of helpers in allocator tests
...
to reduce repetition
2016-05-07 20:18:21 +01:00
Matthias Radestock
c3a2ea3dd8
Merge branch '1.5'
2016-05-07 17:57:10 +01:00
Matthias Radestock
c54f2959ad
Merge pull request #2266 from weaveworks/issues/2233-peer-name-docs
...
Document peer name
Fixes #2233 .
2016-05-07 17:56:39 +01:00
Matthias Radestock
ac0f284c5f
Merge branch '1.5'
2016-05-07 14:43:04 +01:00
Matthias Radestock
bd06553ce0
Merge pull request #2262 from weaveworks/issues/2194-reclaim-plugin-addrs
...
Reclaim plugin addresses without warning
Fixes #2194
2016-05-07 14:41:03 +01:00
Adam Harrison
158fa9d8e5
Reclaim plugin addresses using container ID of '_'
2016-05-07 14:35:15 +01:00
Anita Buehrle
d234ca6ab8
clarified sentence, cosmetic
2016-05-06 12:41:59 -05:00
Bryan Boreham
8d71467802
Kill process instead of container, on container restart.
...
When Docker restarts a container and something goes wrong attaching
the network, kill the process inside the container instead of killing
the container, so that Docker will restart it again
2016-05-06 18:02:11 +01:00
Adam Harrison
8c5cbc738a
Document peer name
2016-05-06 17:47:34 +01:00
Bryan Boreham
01e3d1d81b
Refactor: extract kill_container function
2016-05-06 15:45:54 +01:00
Matthias Radestock
5e297c366e
Merge branch '1.5'
2016-05-06 15:13:19 +01:00
Matthias Radestock
39b0d2a0cb
Merge pull request #2261 from weaveworks/readme-update
...
remove duplicate content in README
Fixes #2217
2016-05-06 15:10:59 +01:00
Adam Harrison
260b416cd7
Include interface name in container-addrs output
2016-05-06 14:12:50 +01:00
Adam Harrison
ad5845b67f
Fix echo_ips
2016-05-06 14:12:19 +01:00
Bryan Boreham
b426973679
Merge branch '1.5'
2016-05-06 12:46:21 +01:00
Bryan Boreham
7fcd837277
Cosmetic
2016-05-06 12:45:54 +01:00
Bryan Boreham
5993b3e846
Refactor: extract function to look up waiting channel for container
2016-05-06 12:45:03 +01:00
Matthias Radestock
cf7ea357de
Merge branch '1.5'
2016-05-06 11:21:57 +01:00
Matthias Radestock
4e48b956d9
Merge pull request #2250 from weaveworks/issues/2245-document-log-level
...
Document --log-level
Fixes #2245
2016-05-06 11:21:20 +01:00
Matthias Radestock
5b5d9d833a
Merge pull request #2219 from weaveworks/export-wider
...
Document adding a route on non-Weave hosts
2016-05-06 11:20:27 +01:00
Bryan Boreham
e16a4aa97a
Document adding a route on non-Weave hosts
2016-05-06 11:13:15 +01:00
Bryan Boreham
12fa345d10
Punctuation
2016-05-06 11:10:34 +01:00
Matthias Radestock
d2ea7e046d
make clear that this repo is for Weave Net
...
...and make the links more relevant and 'active'
2016-05-06 10:55:29 +01:00
Matthias Radestock
1b50285609
add link to Weave Net product when first mentioning it
...
just as we do for scope and flux
2016-05-06 10:55:29 +01:00
Matthias Radestock
658c910862
fix typo
2016-05-06 10:55:29 +01:00
Anita Buehrle
e1ab6a9035
removed installing heading
2016-05-06 10:55:29 +01:00
abuehrle
8c8709e527
added overview links to install
2016-05-06 10:55:29 +01:00
abuehrle
d1e004dedc
removed duplicate content added links to website
2016-05-06 10:55:29 +01:00
Matthias Radestock
8a827bebc8
Merge branch '1.5'
2016-05-05 17:56:57 +01:00
Martynas Pumputis