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: 601bed384940
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 11e72e547d01
Choose a head ref
  • 4 commits
  • 16 files changed
  • 2 contributors

Commits on Sep 4, 2019

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

    This reverts commit 7dc6e77, reversing
changes made to bce47ea.

Motivation for the revert in #67563
    @srhb
    Johan Thomsen authored and srhb committed Sep 4, 2019
    Copy the full SHA
    00975b5 View commit details
    Browse the repository at this point in the history

  2. kubernetes: 1.14.3 -> 1.15.3

    @srhb
    Johan Thomsen authored and srhb committed Sep 4, 2019
    Copy the full SHA
    10e416c View commit details
    Browse the repository at this point in the history

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

    @srhb
    Johan Thomsen authored and srhb committed Sep 4, 2019
    Copy the full SHA
    d891283 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. Merge pull request #67563 from johanot/kubernetes-1.15-withmodulerevert 

    kubernetes: 1.14.3 -> 1.15.3

Also reverts the module systemd dependencies
    @srhb
    srhb committed Sep 5, 2019
    Copy the full SHA
    11e72e5 View commit details
    Browse the repository at this point in the history