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: 2912c1c8ac54
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5ae048071d8a
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 12, 2019

  1. nixos/flannel: add options to configure kubernetes as config backend … 

    …for flannel
    Johan Thomsen committed Feb 12, 2019
    Copy the full SHA
    9522ca5 View commit details
    Browse the repository at this point in the history

  2. nixos/flannel: fix flannel nixos test, add test to all-tests.nix

    Johan Thomsen committed Feb 12, 2019
    Copy the full SHA
    adc9da6 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. nixos/flannel: node name needs to be configured for flannel to work w… 

    …ith kubernetes storage backend
    Johan Thomsen committed Feb 13, 2019
    Copy the full SHA
    94136fd View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Merge pull request #55649 from johanot/flannel-with-kubernetes-backend 

    nixos/flannel: add kubernetes as storage backend (and fix test)
    @offlinehacker
    offlinehacker committed Feb 15, 2019
    Copy the full SHA
    5ae0480 View commit details
    Browse the repository at this point in the history