Merge branch 'master' into staging-next

2019-09-06 16:55:11 +02:00
parent cdf426488b 4a1189e0ab
commit f9237f3152
36 changed files with 235 additions and 441 deletions
@@ -178,12 +178,6 @@ let
    '';
  };
 in mapAttrs mkElkTest {
-  ELK-5 = {
-    elasticsearch = pkgs.elasticsearch5;
-    logstash      = pkgs.logstash5;
-    kibana        = pkgs.kibana5;
-    journalbeat   = pkgs.journalbeat5;
-  };
  ELK-6 =
    if enableUnfree
    then {