Jan Tojnar cdf426488b

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

Fixed trivial conflicts caused by removing rec.

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

..

addons

Merge branch 'master' into staging-next

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

addon-manager.nix

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

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

apiserver.nix

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

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

controller-manager.nix

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

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

default.nix

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

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

flannel.nix

nixos/kubernetes: make module compatible with v1.15.x

2019-09-04 17:38:41 +02:00

kubelet.nix

nixos/kubernetes: make module compatible with v1.15.x

2019-09-04 17:38:41 +02:00

pki.nix

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

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

proxy.nix

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

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

scheduler.nix

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

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