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: d6517b6e5e11
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e35212ac6472
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 15, 2017

  1. kubernetes: 1.4.6 -> 1.5.2

    @moretea
    moretea committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    ce9b34d View commit details
    Browse the repository at this point in the history

  2. kubernetes: Fix build 

    Disabled "mungedocs", which broke the build.
This appears to be a piece of development tooling to make sure that
the documentation is correct. We don't really care about that when we
a specific k8s version for NixOS.
    @moretea
    moretea committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    e81f400 View commit details
    Browse the repository at this point in the history

  3. kubernetes: build-tools was renamed to build

    @moretea
    moretea committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    6345b76 View commit details
    Browse the repository at this point in the history

  4. kube-controller-manager service: Allow restarts on failure

    @moretea
    moretea committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    69391e3 View commit details
    Browse the repository at this point in the history

  5. kubernetes vm test: make dig and netcat available 

    Dig could not be found in the test cases. Adding it as a global package
fixes this.
    @moretea
    moretea committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    9f892de View commit details
    Browse the repository at this point in the history

  6. Merge pull request #21125 from moretea/update-k8s-to-1.5 

    kubernetes: 1.4.6 -> 1.5.1
    @offlinehacker
    offlinehacker committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    e35212a View commit details
    Browse the repository at this point in the history