diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-16 14:34:03 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-16 14:34:03 -0400 |
| commit | 67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e (patch) | |
| tree | eddc87a600bfd5cf9f6f6ff15f8e735664eae1e1 /nixos/modules/services/monitoring/cadvisor.nix | |
| parent | e9c2957c1465838c27c7a67e56a6ade95033eefd (diff) | |
| parent | b8cff61c330400e39dbac22b8993fe58fb35ec13 (diff) | |
| download | nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.tar nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.tar.gz nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.tar.bz2 nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.tar.lz nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.tar.xz nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.tar.zst nixlib-67b0ddf3f30d975bd41bc2ac1cc871436ed1af0e.zip | |
Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020
Diffstat (limited to 'nixos/modules/services/monitoring/cadvisor.nix')
| -rw-r--r-- | nixos/modules/services/monitoring/cadvisor.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 695a8c42e85e..655a6934a266 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -135,7 +135,6 @@ in { serviceConfig.TimeoutStartSec=300; }; - virtualisation.docker.enable = mkDefault true; }) ]; } |