summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4Jaka Hudoklin2015-11-17
|\
| * influxdb: 0.8.3 -> 0.9.4, fix moduleJaka Hudoklin2015-11-16
* | Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0Jaka Hudoklin2015-11-17
|\ \
| * | bosun module: update moduleJaka Hudoklin2015-11-16
| |/
* | Merge pull request #11061 from offlinehacker/nixos/heapster/addJaka Hudoklin2015-11-17
|\ \
| * | heapster module: initJaka Hudoklin2015-11-16
| |/
* | Merge pull request #11058 from offlinehacker/nixos/kubernetes1/gitJaka Hudoklin2015-11-17
|\ \
| * | kubernetes module: kubelet add git and ssh to pathJaka Hudoklin2015-11-16
| |/
* | Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0Jaka Hudoklin2015-11-17
|\ \
| * | grafana module: updateJaka Hudoklin2015-11-16
| |/
* | Merge pull request #10610 from joachifm/scsi-link-pmDomen Kožar2015-11-16
|\ \
| * | nixos: set scsi link power policy using udevJoachim Fasting2015-10-25
* | | Merge pull request #9733 from basvandijk/wordpress-fix-extraConfigDomen Kožar2015-11-16
|\ \ \ | |_|/ |/| |
| * | wordpress: Execute the extraConfig before loading wp-settings.phpBas van Dijk2015-09-09
* | | Merge pull request #11005 from robbinch/fix-nix-serveRickard Nilsson2015-11-16
|\ \ \
| * | | Change argument --port to --listen in nix-serve.nixRobbin C2015-11-13
* | | | Merge pull request #11022 from dasjoe/manualPascal Wittmann2015-11-15
|\ \ \ \
| * | | | nixos manual: point to NixOps' homepage, not GithubHajo Möller2015-11-14
* | | | | Merge remote-tracking branch 'upstream/master' into master.upstreamWilliam A. Kennington III2015-11-14
|\| | | |
| * | | | lighttpd: fix mod_rewrite appearing twiceGuillaume Maudoux2015-11-14
* | | | | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""William A. Kennington III2015-11-14
|/ / / /
* | | | Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III2015-11-13
|\ \ \ \
| * \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-07
| |\ \ \ \
| * \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/systemd-219' into stagingEelco Dolstra2015-11-04
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-10-30
| | |\ \ \ \ \ \
| | * | | | | | | systemd: Update to 227Eelco Dolstra2015-10-07
| | * | | | | | | Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-10-01
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-09-21
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into systemd-219Eelco Dolstra2015-09-07
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | stage-1: fix typo that breaks resumeSpencer Janssen2015-07-31
| | * | | | | | | | | | Merge remote-tracking branch 'origin/staging' into systemd-219Eelco Dolstra2015-07-20
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Disable system_tarball_pc and fix evalEelco Dolstra2015-06-15
| | * | | | | | | | | | | systemd: Use upstream tmpfiles.d rulesTuomas Tynkkynen2015-06-03
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-05-22
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | systemd: Update to 220Eelco Dolstra2015-05-22
| | * | | | | | | | | | | | Set up /etc/machine-id before starting systemdEelco Dolstra2015-05-18
| | * | | | | | | | | | | | stage-1: Shut up warnings about swap devices that don't exist yetEelco Dolstra2015-05-11
| | * | | | | | | | | | | | Allow systemd-journald to be restartedEelco Dolstra2015-05-11
| | * | | | | | | | | | | | stage-2: Don't run hwclock in containersEelco Dolstra2015-05-11
| | * | | | | | | | | | | | stage-1: Don't mount /dev/shm if it's already mountedEelco Dolstra2015-05-11
| | * | | | | | | | | | | | Create systemd-{network,resolve} user/group unconditionallyEelco Dolstra2015-05-11
| | * | | | | | | | | | | | Use ConditionVirtualization to disable some services in containersEelco Dolstra2015-05-11
| | * | | | | | | | | | | | systemd: Update to 219Eelco Dolstra2015-05-11
| * | | | | | | | | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge master into stagingVladimír Čunát2015-10-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06"Eelco Dolstra2015-10-06
| * | | | | | | | | | | | | | | | Merge branch 'master.upstream' into staging.post-15.06William A. Kennington III2015-10-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \