Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: weaveworks/weave
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f20d40a17b4c3dc6c2d3af47489d70571d425fc
Choose a base ref
..
head repository: weaveworks/weave
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d14fa9e380e4859a2056f7499264c91b50aea19d
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +3 −3 test/880_cni_plugin_ip_address_assignment_test.sh
6 changes: 3 additions & 3 deletions test/880_cni_plugin_ip_address_assignment_test.sh
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@ run_on $HOST1 sudo mkdir -p /opt/cni/bin
weave_on $HOST1 setup-cni
weave_on $HOST1 launch

C0=$(docker_on $HOST1 run --net=none --name=c0 -dt $SMALL_IMAGE /bin/sh)
C1=$(docker_on $HOST1 run --net=none --name=c1 -dt $SMALL_IMAGE /bin/sh)
C2=$(docker_on $HOST1 run --net=none --name=c2 -dt $SMALL_IMAGE /bin/sh)
C0=$(docker_on $HOST1 run --net=none --name=c0 --privileged -dt $SMALL_IMAGE /bin/sh)
C1=$(docker_on $HOST1 run --net=none --name=c1 --privileged -dt $SMALL_IMAGE /bin/sh)
C2=$(docker_on $HOST1 run --net=none --name=c2 --privileged -dt $SMALL_IMAGE /bin/sh)

# Enable unsolicited ARPs so that ping after the address reuse does not time out
exec_on $HOST1 c1 sysctl -w net.ipv4.conf.all.arp_accept=1