diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 00:01:36 +0000 |
| commit | dc802b2e196f95ce42daa7591e475bba34047331 (patch) | |
| tree | e490c9bceea445e1eff80d7e883b5621e2c29bec /pkgs/applications/networking | |
| parent | e15af378fb53182b63f645c34e4f01cc5879912c (diff) | |
| parent | d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 (diff) | |
| download | nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.gz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.bz2 nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.lz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.xz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.zst nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/nomad/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index dc22ab41d8b..f4ddc038d2b 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -53,6 +53,6 @@ buildGoPackage rec { description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e4a8c0c0abb..c255ccd1ef8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -62,6 +62,7 @@ let marsam timstott zimbatm + maxeaubrey ]; }; } // attrs'); |