Merge master into staging-next

2021-04-22 18:14:27 +00:00
parent de5555d8e9 bdf8e0fc31
commit b95da5efb6
37 changed files with 229 additions and 405 deletions
@@ -343,7 +343,6 @@ in
  proxy = handleTest ./proxy.nix {};
  pt2-clone = handleTest ./pt2-clone.nix {};
  qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
-  quagga = handleTest ./quagga.nix {};
  quorum = handleTest ./quorum.nix {};
  rabbitmq = handleTest ./rabbitmq.nix {};
  radarr = handleTest ./radarr.nix {};