Adam Harrison
|
b1d09305e4
|
Merge pull request #2687 from weaveworks/issues/1644-fastdp-crypto
Fastdp crypto
|
2017-02-01 10:28:24 +00:00 |
|
Adam Harrison
|
8a5a15d5e9
|
Merge pull request #2753 from weaveworks/mv-signal-to-common
Move signal handling loop to common.
|
2017-01-30 12:38:23 +00:00 |
|
Adam Harrison
|
81add75258
|
Merge pull request #2711 from weaveworks/issues/2427-unique-ids
Better machine unique IDs
|
2017-01-13 09:40:18 +00:00 |
|
Adam Harrison
|
92cfd3b4f9
|
Merge pull request #2725 from weaveworks/update-tools
Update tools submodule to avoid breaking on missing Docker mflag
|
2017-01-09 17:09:53 +00:00 |
|
Adam Harrison
|
4e740736e7
|
Merge pull request #2697 from weaveworks/issues/2693-npc-log-instructions
Fix instructions to view npc logs when >1 pod exists
|
2017-01-09 16:23:42 +00:00 |
|
Adam Harrison
|
2ae2d52289
|
Merge pull request #2722 from weaveworks/issues/2719-delete-pods
Warn not to delete all Weave Net pods
|
2017-01-09 15:48:48 +00:00 |
|
Adam Harrison
|
635191970f
|
Merge pull request #2688 from weaveworks/issues/2684-exec-weaver
Exec weaver from weave-kube launch rather than running in background
|
2017-01-09 15:24:19 +00:00 |
|
Adam Harrison
|
be8d9d88d8
|
Merge pull request #2724 from weaveworks/2647-remove-dependency-on-jq
Removed dependency on jq in test #175.
|
2017-01-09 10:59:52 +00:00 |
|
Adam Harrison
|
61d22bb8b4
|
Merge pull request #2686 from weaveworks/issues/2580-allow-ips
Allow docker bridge to have more than one IP address
|
2017-01-04 14:35:48 +00:00 |
|
Adam Harrison
|
eb3bbff883
|
Merge pull request #2708 from weaveworks/weave-kube-mounts
Mount /etc under a different path for weave-kube
|
2017-01-04 10:15:54 +00:00 |
|
Adam Harrison
|
03c1379d1b
|
Merge pull request #2716 from liubog2008/fix
fix a bug of updating network policy
|
2017-01-03 17:44:58 +00:00 |
|
Adam Harrison
|
11ff1880e5
|
Merge pull request #2666 from weaveworks/issues/2633-json-events
Log objects via JSON for better debugging
|
2016-12-07 17:25:55 +00:00 |
|
Adam Harrison
|
b03311e99d
|
Merge pull request #2683 from weaveworks/issues/2673-expose-again
Re-add expose to ensure it gets run on all nodes
|
2016-12-07 11:23:52 +00:00 |
|
Adam Harrison
|
0c1138ee60
|
Merge pull request #2662 from weaveworks/issues/2594-setup-cni
Unify weave and launch.sh CNI setup
|
2016-12-07 11:21:25 +00:00 |
|
Adam Harrison
|
597c6c111d
|
Merge pull request #2657 from weaveworks/remove-bridge-on-error
Remove weave bridge if something goes wrong when creating it
|
2016-12-06 11:41:29 +00:00 |
|
Adam Harrison
|
f3915592b2
|
Merge pull request #2679 from weaveworks/expose-loop
Run iptables commands in a loop
|
2016-12-06 11:30:20 +00:00 |
|
Adam Harrison
|
46e4f047de
|
Merge pull request #2672 from weaveworks/issues/2669-iprange-clash
Check whether Weave's IP range overlaps something on the host already
|
2016-11-28 11:53:50 +00:00 |
|
Adam Harrison
|
354d1ddd5c
|
Merge pull request #2670 from weaveworks/issues/2667-firewall-rules
Run GCE test VMs on a locked-down network
|
2016-11-25 13:09:54 +00:00 |
|
Adam Harrison
|
01c436ae15
|
Merge pull request #2642 from weaveworks/fix-launch-version
Fix weave-kube launch.sh version usage
|
2016-11-23 10:36:16 +00:00 |
|
Adam Harrison
|
664ba8735f
|
Merge pull request #2643 from weaveworks/issues/2632-cni-no-check-alive
Don't release CNI-allocated IP address when container dies
|
2016-11-22 16:17:11 +00:00 |
|
Adam Harrison
|
a6edd40de3
|
Merge pull request #2658 from weaveworks/issues/2632-use-pod-status
Make NPC only look at IP addresses on running pods
|
2016-11-22 15:27:48 +00:00 |
|
Adam Harrison
|
9b606fb823
|
Merge pull request #2637 from weaveworks/issues/2617-cni-expose
Remove 'weave expose' race in CNI plugin
|
2016-11-14 15:11:38 +00:00 |
|
Adam Harrison
|
46eb01604c
|
Merge pull request #2565 from weaveworks/2537-fix-status-on-version-check-failures
Improve 'status' to handle cases when the checkpoint API is not available
|
2016-11-11 16:14:24 +00:00 |
|
Adam Harrison
|
ea82a6715f
|
Merge pull request #2569 from weaveworks/weave-kube-smoke-test
weave-kube smoke test
|
2016-11-04 12:58:20 +00:00 |
|
Adam Harrison
|
e3f7e0a23a
|
Merge pull request #2590 from weaveworks/issues/2586-/opt/cni/bin-never-upgraded
Add support for atomic and versioned upgrades of CNI plugin.
|
2016-11-04 12:27:48 +00:00 |
|
Adam Harrison
|
d3f2c110e4
|
Merge pull request #2589 from weaveworks/issues/2587-cni-weaveutil
Fix CNI plugin calling weaveutil
|
2016-11-04 10:47:38 +00:00 |
|
Adam Harrison
|
40b3a49c90
|
Merge pull request #2563 from weaveworks/update-test-template
Update CI VMs to Ubuntu 16.04 and Docker 1.11
|
2016-11-03 17:35:21 +00:00 |
|
Adam Harrison
|
431b87b94a
|
Merge pull request #2591 from weaveworks/reset-npc
Have 'weave reset' remove NPC rules
|
2016-11-03 15:22:46 +00:00 |
|
Adam Harrison
|
8fcb5daedf
|
Merge pull request #2551 from weaveworks/weave-kube
Merge weave-kube into the Weave Net repo
|
2016-10-31 17:12:03 +00:00 |
|
Adam Harrison
|
4b77662e3b
|
Merge pull request #2561 from weaveworks/issues/2560-fix-dns-ipam-metrics
Do not expose IPAM or DNS metrics if weave does not run IPAM or DNS
|
2016-10-26 14:24:43 +01:00 |
|
Adam Harrison
|
a5ff7ab8df
|
Merge pull request #2475 from weaveworks/issues/2419-withnetns
Add a safer version of WithNetNS*
|
2016-10-26 13:50:34 +01:00 |
|
Adam Harrison
|
f9bada5af8
|
Merge pull request #2558 from weaveworks/fix-broken-url-in-doc
Fixed broken link to plugin.md to weave-docker-api.md.
|
2016-10-24 16:57:07 +01:00 |
|
Adam Harrison
|
264e5c9979
|
Merge pull request #2541 from weaveworks/issues/2540-withnetns
Change namespace via nsenter, for plugin arp-config step
|
2016-10-07 12:20:47 +01:00 |
|
Adam Harrison
|
7249350757
|
Merge pull request #2531 from weaveworks/process-addrs
Add weaveutil process-addrs
|
2016-09-30 10:28:59 +01:00 |
|
Adam Harrison
|
cd4cbed5a0
|
Merge pull request #2501 from weaveworks/issues/2495-filter-empty-peers
Reject empty peers
|
2016-09-21 11:12:10 +01:00 |
|
Adam Harrison
|
69b688b357
|
Merge pull request #2509 from weaveworks/issues/2503-persist-peers-fix
Create restart.sentinel after storing the peer list
|
2016-09-21 10:09:05 +01:00 |
|
Adam Harrison
|
7a81bc2ddc
|
Merge pull request #2510 from weaveworks/issues/2329-fix-830-flakiness
Enable unsolicited ARPs in 830 test suite
|
2016-09-20 17:17:19 +01:00 |
|
Adam Harrison
|
3fc7efa536
|
Merge pull request #2498 from weaveworks/broken-link
fixed broken link to command line args
|
2016-09-20 16:40:06 +01:00 |
|
Adam Harrison
|
71e43c2023
|
Merge pull request #2511 from weaveworks/issues/2340-make-640-less-flaky
Filter out netns of non-existing containers
|
2016-09-20 15:52:54 +01:00 |
|
Adam Harrison
|
ebe4c5b8b7
|
Merge pull request #2478 from weaveworks/bridge-veth-setup
Refactor: move bridge veth creation into 'init_bridge'
|
2016-08-18 11:31:16 +01:00 |
|
Adam Harrison
|
9fddb827f9
|
Merge pull request #2442 from weaveworks/cni-setup-fixes
CNI setup fixes
|
2016-08-18 10:55:46 +01:00 |
|
Adam Harrison
|
432e10e19f
|
Merge pull request #2474 from weaveworks/issues/2375-check-vxlan-udp-port
Check if a vxlan vport netdev is UP after its creation
|
2016-08-10 14:44:11 +01:00 |
|
Adam Harrison
|
601bda3176
|
Merge pull request #2457 from weaveworks/issues/2424-weaken-tls-check
Do not fail launching the proxy if unable to detect a running instance of docker daemon
|
2016-08-10 13:58:42 +01:00 |
|
Adam Harrison
|
96f2eb3ecf
|
Merge pull request #2471 from weaveworks/cni-bridge-ip
CNI plugin assigns an IP to the bridge by itself
|
2016-08-10 11:49:25 +01:00 |
|
Adam Harrison
|
c0592ba1b3
|
Merge pull request #2470 from weaveworks/no-force-tag
Remove -f flag from 'docker tag' commands
|
2016-08-10 10:17:06 +01:00 |
|
Adam Harrison
|
472eab2acd
|
Merge pull request #2466 from weaveworks/issues/2464-enable-create-bridge
Re-enable 'weave create-bridge' in fastdp mode.
|
2016-08-10 09:57:40 +01:00 |
|
Adam Harrison
|
ed83efbceb
|
Merge pull request #2450 from weaveworks/eval-considered-harmless
remove dire warnings about 'eval' when using plugin
|
2016-07-28 12:49:55 +01:00 |
|
Adam Harrison
|
223116c4bf
|
Merge pull request #2393 from weaveworks/intro-ops-guide
intro to ops guide (#2387)
|
2016-07-28 12:32:34 +01:00 |
|
Adam Harrison
|
b06ddeb962
|
Merge pull request #2445 from weaveworks/fix-weave-ps
Fix "weave ps" output when weave is not running
|
2016-07-28 11:30:31 +01:00 |
|
Adam Harrison
|
369852a3a7
|
Merge pull request #2430 from weaveworks/remove-duplicate-no-dns
remove duplication of `--no-dns`
|
2016-07-18 11:47:48 +01:00 |
|
Adam Harrison
|
bce07b7491
|
Merge pull request #2439 from weaveworks/restore-script-function-grouping
refactor: restore grouping of functions in script
|
2016-07-12 09:39:15 +01:00 |
|
Adam Harrison
|
f4798fadf8
|
Merge pull request #2374 from weaveworks/issues/1726-plugin-arp
Perform arp configuration for plugin-connected containers
|
2016-06-17 10:19:53 +01:00 |
|
Adam Harrison
|
c6a777c4b0
|
Merge pull request #2366 from weaveworks/issues/2189-publish-weavedb
Publish weavedb container from release script
|
2016-06-16 11:03:27 +01:00 |
|
Adam Harrison
|
adcb1018df
|
Merge pull request #2345 from weaveworks/issues/2344-persist-more
Fix ring persistence after free space update
|
2016-06-09 16:37:57 +01:00 |
|
Adam Harrison
|
f4b9a9b66c
|
Merge pull request #2352 from weaveworks/issues/2318-moar-help
Print usage on --help argument to any command
|
2016-06-09 16:02:35 +01:00 |
|
Adam Harrison
|
843a993600
|
Merge pull request #2332 from weaveworks/issues/2326-warn-rmpeer
Warn on 'weave reset' if DELETE fails
|
2016-06-06 16:56:38 +01:00 |
|
Adam Harrison
|
eaa4bd1a6c
|
Merge pull request #2333 from weaveworks/issues/2302-symlink-loop
Check if socket is identical to weave socket after trimming prefix.
|
2016-06-06 15:20:23 +01:00 |
|
Adam Harrison
|
9b6154cf63
|
Merge pull request #2331 from weaveworks/issues/2320-plugin-warning
Augment warning on active plugin endpoints
|
2016-06-03 16:17:31 +01:00 |
|
Adam Harrison
|
1e4d86775f
|
Merge pull request #2330 from weaveworks/issues/1988-proxy-plugin
Proxy shouldn't weave-attach containers which are using a network plugin
|
2016-06-03 15:48:35 +01:00 |
|
Adam Harrison
|
b3379df53d
|
Merge pull request #2321 from weaveworks/issues/2282-check-subnets
Check validity of IP subnets
|
2016-05-26 16:16:39 +01:00 |
|
Adam Harrison
|
654a811ef0
|
Merge pull request #2319 from weaveworks/issues/2300-spot-gateway
Don't release fake gateway address in plugin
|
2016-05-26 16:07:39 +01:00 |
|
Adam Harrison
|
424d331a32
|
Merge pull request #2314 from weaveworks/disable-doc-previews
Temporarily disable doc previews
|
2016-05-24 17:10:28 +01:00 |
|
Adam Harrison
|
4dca07c9ff
|
Merge pull request #2296 from weaveworks/issues/2284-die-another-way
Move kill-on-failure responsibility to caller of weave script
|
2016-05-18 12:19:44 +01:00 |
|
Adam Harrison
|
b16de0c71e
|
Merge pull request #2299 from weaveworks/issues/fix-offset-abuse
Change the type of entry.Free to address.Count
|
2016-05-18 12:04:54 +01:00 |
|
Adam Harrison
|
78672db440
|
Merge pull request #2292 from weaveworks/issues/2286-hang-torpedoes
Protect against Docker hanging trying to talk to a non-existent plugin
|
2016-05-18 10:27:13 +01:00 |
|
Adam Harrison
|
ee9f8eec1c
|
Merge pull request #2291 from weaveworks/issues/refactor-check-attached
Refactor wait_for_{proxy,attached}
|
2016-05-18 09:44:15 +01:00 |
|
Adam Harrison
|
608da90dc7
|
Publish doc previews for all branches, not just those named issues/* (#2258)
|
2016-05-05 13:33:28 +01:00 |
|
Adam Harrison
|
1283ba4f61
|
Merge pull request #2249 from weaveworks/issues/2209-depersist-on-range-change
Better deleting of persisted IPAM data
|
2016-05-05 10:11:22 +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 |
|
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
|
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
|
e6f031a3c9
|
Merge pull request #2218 from weaveworks/1.6-upgradeathon
Upgrade vendored libs
|
2016-04-28 10:13:44 +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 |
|
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
|
07780fa10c
|
Merge pull request #2188 from weaveworks/doc-improvements
Minor improvements to docs
|
2016-04-19 15:37:23 +01:00 |
|
Adam Harrison
|
a6b7f0a9d4
|
Merge pull request #2185 from weaveworks/change-titles
Restructure docs
|
2016-04-19 15:34:53 +01:00 |
|
Adam Harrison
|
6ad9dac71a
|
Merge pull request #2165 from weaveworks/issues/2164-less-deleting
Store 'checkAlive' flag in IPAM, so we don't delete non-container IDs
|
2016-04-18 11:49:50 +01:00 |
|
Adam Harrison
|
a921f77258
|
Merge pull request #2172 from weaveworks/disable-peer-persistence
Disable persistence of peer lists
|
2016-04-18 11:48:46 +01:00 |
|
Adam Harrison
|
31ca8f9dbf
|
Merge pull request #2135 from weaveworks/issues/2031-persistence-volume
Use a data volume container for persistence of IPAM etc.
|
2016-04-14 13:21:22 +01:00 |
|
Adam Harrison
|
9c7b27acf0
|
Merge pull request #2134 from weaveworks/issues/2063-observer-status
Better log and status messages for Paxos observer
|
2016-04-08 10:11:46 +01:00 |
|
Adam Harrison
|
a897a7711c
|
Merge pull request #2115 from weaveworks/issues/2114-docs-in-wordpress
Restructure `/site` to conform to Wordepress requirements
|
2016-04-07 11:22:40 +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 |
|
Adam Harrison
|
7c37cd98dd
|
Merge pull request #2074 from weaveworks/cleanup-plugin-logging
clean up plugin logging
|
2016-03-29 10:02:21 +01:00 |
|
Adam Harrison
|
c09dfe6b5a
|
Merge pull request #2078 from weaveworks/reify-ipam-config
Reify ipam config
|
2016-03-21 16:12:11 +00:00 |
|
Adam Harrison
|
a26dd1b1d7
|
Merge pull request #2072 from weaveworks/2071-ci-coverage-underreporting
collect coverage data from ci nodes before teardown
|
2016-03-21 15:58:03 +00:00 |
|
Adam Harrison
|
74d0b3b51e
|
Merge pull request #2075 from weaveworks/2044-multi-rmpeer
make `weave rmpeer` accept a list of peers
|
2016-03-21 15:55:22 +00:00 |
|
Adam Harrison
|
cdf3e4b98e
|
Merge pull request #2073 from weaveworks/rmpeer-test
add 'rmpeer' test
|
2016-03-21 11:05:53 +00:00 |
|
Adam Harrison
|
3123418022
|
Merge pull request #2030 from weaveworks/issues/1992-cni-plugin
Implement CNI plugin
|
2016-03-21 10:51:19 +00:00 |
|
Adam Harrison
|
4b5fb2785e
|
Merge pull request #2051 from weaveworks/issues/2046-static-ip
Fix plugin accepting --ip address
|
2016-03-16 15:46:49 +00:00 |
|
Adam Harrison
|
4874605add
|
Merge pull request #2050 from weaveworks/bump-ci-docker
Bump template name so it will fetch latest Docker
|
2016-03-16 13:46:49 +00:00 |
|
Adam Harrison
|
115162fbfd
|
Merge pull request #2037 from weaveworks/2021-fallback-to-hypervisor-uuid
fall back to hypervisor uuid for mac derivation
|
2016-03-14 16:56:00 +00:00 |
|
Adam Harrison
|
29674b7780
|
Merge pull request #2012 from weaveworks/issues/1655-store-all-addresses
Store all addresses+subnets in IPAM
|
2016-03-03 17:06:02 +00:00 |
|
Adam Harrison
|
71af1f3120
|
Merge pull request #1972 from weaveworks/persist-peers
Persist set of peers to connect to
|
2016-02-29 15:54:54 +00:00 |
|
Adam Harrison
|
e65a08471f
|
Merge pull request #1967 from weaveworks/issues/1859-start-existing
Start existing container, if its image and arguments match
|
2016-02-29 15:33:30 +00:00 |
|
Adam Harrison
|
31a964ba9b
|
Merge pull request #1954 from weaveworks/version-check
Periodically check for up to date versions of weave.
|
2016-02-26 17:25:24 +00:00 |
|
Adam Harrison
|
639e0e82c9
|
Merge pull request #1989 from weaveworks/1977-restarting-not-running
treat 'restarting' as 'not running'
|
2016-02-23 10:49:31 +00:00 |
|
Adam Harrison
|
4b0a6e1433
|
Merge pull request #1983 from weaveworks/1929-auto-detect-odp-on-relaunch
don't complain on relaunch when ODP is not supported
|
2016-02-23 10:46:36 +00:00 |
|
Adam Harrison
|
2d4d3577ba
|
Merge pull request #1971 from weaveworks/issues/678-persist-ipam2
Persist IPAM ring
|
2016-02-15 10:15:53 +00:00 |
|