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: cd972113586a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9366d013f07c
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 17, 2017

  1. openshift: 1.5.0 -> 3.6.0 

    - Updated from 1.5.0 to 3.6.0 (this is just the next version, but Red
  Hat did quite the version bump there)
- Added 'v' to the version; it is used by `oc cluster up` to determine
  which image should be downloaded.
- Added myself as a maintainer.
    @moretea
    moretea committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    f8a7266 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. Fix oc cluster up 

    The command `oc cluster up` mainly runs code though Docker containers.

However, in pkg/bootstrap/docker/host/host.go, nsenter is used to run
some commands on the host. For this to work on NixOS, we need to provide
the absolute path to the required programs.
    @moretea
    moretea committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    a3dde77 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2017

  1. mount is in utillinux

    @moretea
    moretea committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    d27f710 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2017

  1. Merge pull request #28345 from moretea/openshift-origin 

    openshift: 1.5.0 -> 3.6.0
    @Mic92
    Mic92 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    9366d01 View commit details
    Browse the repository at this point in the history