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

Commits on May 11, 2018

  1. nixos/tests/mesos: wait for all services and ports 

    to be available before sending requests.
Avoids non-deterministic test failure.
    @xeji
    xeji committed May 11, 2018
    Copy the full SHA
    0d2a4ed View commit details
    Browse the repository at this point in the history

  2. nixos/mesos-slave: start after docker 

    If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"
    @xeji
    xeji committed May 11, 2018
    Copy the full SHA
    ec00b6f View commit details
    Browse the repository at this point in the history

Commits on May 13, 2018

  1. Merge pull request #40373 from xeji/fix-mesos-test 

    nixos/mesos: fix non-deterministic service and test failure
    @xeji
    xeji committed May 13, 2018
    Copy the full SHA
    c482b41 View commit details
    Browse the repository at this point in the history