Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also 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: NixOS/nixpkgs
base: 7cc1c2c626f3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7835641e7757
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 14, 2020

  1. nixosTests.flannel: port to python, unbreak 

    For reasons yet unknown, the vxlan backend doesn't work (at least inside
the qemu networking), so this is moved to the udp backend.

Note changing the backend apparently also changes the interface name,
it's now `flannel0`, not `flannel.1`

fixes #74941
    @flokli
    flokli committed Apr 14, 2020
    Copy the full SHA
    28ef438 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Merge pull request #85252 from flokli/nixos-flannel-fix 

    nixosTests.flannel: port to python, unbreak
    @flokli
    flokli committed Apr 15, 2020
    Copy the full SHA
    7835641 View commit details
    Browse the repository at this point in the history