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: 51e1e3ceaf0e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0715f2f1a9b3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 28, 2019

  1. nixos-containers: add TimeoutStartSec option 

    Default is now 1m instead of global default of 15sec. It is also
configurable.

Fixes issue where start of many containers (40+) fail
#65001

(cherry picked from commit eba686d)
Reason: Problem exists in stable too
    @davidak
    davidak committed Aug 28, 2019
    Copy the full SHA
    6a04061 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. Merge pull request #66205 from davidak/backport_nixos-containers-Time… 

    …outStartSec

[19.03] nixos-containers: add TimeoutStartSec option
    @infinisil
    infinisil committed Aug 29, 2019
    Copy the full SHA
    0715f2f View commit details
    Browse the repository at this point in the history