diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-31 09:51:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-31 09:53:49 +0100 |
| commit | 1fcd92ce923d33ab3d8c0b6c6d42473b135f114b (patch) | |
| tree | c0f696c1c2d3ff82067d891ee25bb4f44af54880 /nixos/modules/module-list.nix | |
| parent | 4d2b7638173afb4c0f0c12a43654bcff5c9500ab (diff) | |
| parent | ab3a12ed7ee0de4d247a8017151a1bf01829f6f7 (diff) | |
| download | nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.gz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.bz2 nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.lz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.xz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.zst nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.zip | |
Merge branch 'master' into staging
A few thousand rebuilds from master, again. Hydra: ?compare=1422362
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ccc2a46456e8..700b3baaa906 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -403,6 +403,7 @@ ./services/monitoring/vnstat.nix ./services/monitoring/zabbix-agent.nix ./services/monitoring/zabbix-server.nix + ./services/network-filesystems/beegfs.nix ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/davfs2.nix ./services/network-filesystems/drbd.nix |