diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
| commit | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch) | |
| tree | fa53c32dfef1265496170172a28a3c71bb32a655 /nixos/tests/all-tests.nix | |
| parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
| parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
| download | nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2 nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests/all-tests.nix')
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8ee4dfbf13bc..5eb8111aa6d3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -224,7 +224,6 @@ in predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; prometheus = handleTest ./prometheus.nix {}; - prometheus2 = handleTest ./prometheus-2.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; |