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: ee951c348b3b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ec1ee660c995
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 16, 2018

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

    to be available before sending requests.
Avoids non-deterministic test failure.

(cherry picked from commit 0d2a4ed)
    @xeji
    xeji committed May 16, 2018
    Configuration menu
    Copy the full SHA
    345f14e 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"

(cherry picked from commit ec00b6f)
    @xeji
    xeji committed May 16, 2018
    Configuration menu
    Copy the full SHA
    ec1ee66 View commit details
    Browse the repository at this point in the history