summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-26
|\
| * Merge pull request #41073 from johanot/kube-1.10Sarah Brofeldt2018-05-26
| |\
| | * Kubernetes:Johan Thomsen2018-05-26
| | * Kubernetes tests: increase the size of the VM from 700MB to 1.5GBAlberto Berti2018-05-25
| | * Kuberetes Dashboard addon 1.8.2 -> 1.8.3Alberto Berti2018-05-25
| | * Kuberbetes DNS addon 1.14.4 -> 1.14.10Alberto Berti2018-05-25
| | * kubernetes: update to 1.10Charles Strahan2018-05-25
| * | ids: assing openvpnPeter Hoeg2018-05-26
| |/
* | Merge branch 'master' into stagingJan Malakhovski2018-05-26
|\|
| * w3m: Add a variant without graphics support and use for NixOS manualTuomas Tynkkynen2018-05-25
| * nixos/installer: Drop dmraidTuomas Tynkkynen2018-05-25
| * nixos/systemd-timesyncd: use the correct server list (#40919)Daniel Frank2018-05-24
| * nixos/slurm: fix xml tag mismatch in manualUli Baum2018-05-24
| * Merge pull request #40947 from samueldr/fix/34779lewo2018-05-24
| |\
| | * tests/docker-tools: Adds regression test for #34779Samuel Dionne-Riel2018-05-24
| * | Merge pull request #40665 from seppeljordan/fix-kubernetes-moduleslewo2018-05-24
| |\ \
| | * | nixos/kubernetes: Update kube-dns and kube-dashbashboard docker image derivat...Sebastian Jordan2018-05-16
| * | | Merge pull request #41016 from markuskowa/slurm-prxeji2018-05-24
| |\ \ \
| | * | | nixos/slurm: add slurm test to release.nixMarkus Kowalewski2018-05-24
| | * | | nixos/slurm: enable munge by default, added note to slurm descriptionMarkus Kowalewski2018-05-24
| | * | | slurm/module: add ProcTrackType option to unbreak default setupMarkus Kowalewski2018-05-24
| * | | | nixos mysql: make start-up more robust (#41010)Peter Hoeg2018-05-24
| * | | | kubernetes: fix 404 links to documentationGeoffrey Huntley2018-05-24
| * | | | nixos/borgbackup: make extraArgs a shell variableRobert Schütz2018-05-24
| * | | | Merge pull request #41015 from tazjin/feat/datadog-gohaiJörg Thalheim2018-05-24
| |\ \ \ \
| | * | | | nixos/dd-agent: fix runtime errors by adding gohai to $PATHVincent Ambo2018-05-24
| * | | | | Merge pull request #40879 from seppeljordan/pr-ipfs-port-scanningSarah Brofeldt2018-05-24
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | nixos/ipfs: Improve behavior of localDiscovery optionSebastian Jordan2018-05-23
| | * | | | nixos/ipfs: Add option to disable local port scanning for ipfs daemonSebastian Jordan2018-05-21
| * | | | | crowd: 3.0.1 -> 3.1.2Simon Lackerbauer2018-05-24
| * | | | | nixos/prometheus-node-exporter: fix file collectorWilliButz2018-05-24
| * | | | | gitlab module: update for 10.8Robin Gloster2018-05-24
| * | | | | nixos/borgbackup: let borg write to disk and see /tmp, add extraArgsSimon Lackerbauer2018-05-24
| * | | | | nixos/oxidized: add moduleWilliButz2018-05-24
| * | | | | nixos/programs/shell.nix: Enhance bad ownership error messageTuomas Tynkkynen2018-05-24
| * | | | | nixos/programs/shell.nix: Use [ ] instead of testTuomas Tynkkynen2018-05-24
| * | | | | nixos/programs/shell.nix: Quote variablesTuomas Tynkkynen2018-05-24
| * | | | | Merge pull request #40462 from samueldr/fix/grub-backgroundGraham Christensen2018-05-23
| |\ \ \ \ \
| | * | | | | nixos/grub: Implements use of file format for splashImage.Samuel Dionne-Riel2018-05-13
| | * | | | | nixos/grub: Updates `splashImage` description to match reality.Samuel Dionne-Riel2018-05-13
| | | |_|/ / | | |/| | |
* | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-23
|\| | | | |
| * | | | | beegfs/module: Fix a typo in meta.conf generation (#40979)markuskowa2018-05-23
* | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-23
|\| | | | |
| * | | | | Merge pull request #40778 from phile314/slimserver-fixSarah Brofeldt2018-05-23
| |\ \ \ \ \
| | * | | | | nixos/slimserver: Disable broken image/video support (#40589)Philipp Hausmann2018-05-23
| * | | | | | Merge pull request #40806 from Mic92/nixos-idsYegor Timoshenko2018-05-23
| |\ \ \ \ \ \
| | * | | | | | nixos/ids: information when to use static uids/gidsJörg Thalheim2018-05-20
| | |/ / / / /
| * | | | | | Merge pull request #39982 from tadfisher/scsi-link-policyYegor Timoshenko2018-05-22
| |\ \ \ \ \ \
| | * | | | | | nixos/powerManagement: add "med_power_with_dipm" scsiLinkPolicyTad Fisher2018-05-04
| * | | | | | | Merge pull request #40881 from hedning/flatpax-xdg-data-dirsMatthew Justin Bauer2018-05-22
| |\ \ \ \ \ \ \