Jan Tojnar cdf426488b

Merge branch 'master' into staging-next ...

Fixed trivial conflicts caused by removing rec.

2019-09-06 03:20:09 +02:00

..

base.nix

Merge branch 'master' into staging-next

2019-09-06 03:20:09 +02:00

default.nix

kubernetes: fix tests

2017-09-24 11:44:25 +02:00

dns.nix

Revert "Merge pull request #56789 from mayflower/upstream-k8s-refactor"

2019-09-04 17:37:02 +02:00

e2e.nix

nixos: kubernetes fixes

2018-03-30 17:33:45 -04:00

rbac.nix

Revert "Merge pull request #56789 from mayflower/upstream-k8s-refactor"

2019-09-04 17:37:02 +02:00