Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4 | Jaka Hudoklin | 2015-11-17 |
|\ | |||
| * | influxdb: 0.8.3 -> 0.9.4, fix module | Jaka Hudoklin | 2015-11-16 |
* | | Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0 | Jaka Hudoklin | 2015-11-17 |
|\ \ | |||
| * | | bosun module: update module | Jaka Hudoklin | 2015-11-16 |
| |/ | |||
* | | Merge pull request #11061 from offlinehacker/nixos/heapster/add | Jaka Hudoklin | 2015-11-17 |
|\ \ | |||
| * | | heapster module: init | Jaka Hudoklin | 2015-11-16 |
| |/ | |||
* | | Merge pull request #11058 from offlinehacker/nixos/kubernetes1/git | Jaka Hudoklin | 2015-11-17 |
|\ \ | |||
| * | | kubernetes module: kubelet add git and ssh to path | Jaka Hudoklin | 2015-11-16 |
| |/ | |||
* | | Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0 | Jaka Hudoklin | 2015-11-17 |
|\ \ | |||
| * | | grafana module: update | Jaka Hudoklin | 2015-11-16 |
| |/ | |||
* | | Merge pull request #10610 from joachifm/scsi-link-pm | Domen Kožar | 2015-11-16 |
|\ \ | |||
| * | | nixos: set scsi link power policy using udev | Joachim Fasting | 2015-10-25 |
* | | | Merge pull request #9733 from basvandijk/wordpress-fix-extraConfig | Domen Kožar | 2015-11-16 |
|\ \ \ | |_|/ |/| | | |||
| * | | wordpress: Execute the extraConfig before loading wp-settings.php | Bas van Dijk | 2015-09-09 |
* | | | Merge pull request #11005 from robbinch/fix-nix-serve | Rickard Nilsson | 2015-11-16 |
|\ \ \ | |||
| * | | | Change argument --port to --listen in nix-serve.nix | Robbin C | 2015-11-13 |
* | | | | Merge pull request #11022 from dasjoe/manual | Pascal Wittmann | 2015-11-15 |
|\ \ \ \ | |||
| * | | | | nixos manual: point to NixOps' homepage, not Github | Hajo Möller | 2015-11-14 |
* | | | | | Merge remote-tracking branch 'upstream/master' into master.upstream | William A. Kennington III | 2015-11-14 |
|\| | | | | |||
| * | | | | lighttpd: fix mod_rewrite appearing twice | Guillaume Maudoux | 2015-11-14 |
* | | | | | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" | William A. Kennington III | 2015-11-14 |
|/ / / / | |||
* | | | | Merge commit 'cb21b77' into master.upstream | William A. Kennington III | 2015-11-13 |
|\ \ \ \ | |||
| * \ \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-07 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-05 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/systemd-219' into staging | Eelco Dolstra | 2015-11-04 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into systemd-219 | Eelco Dolstra | 2015-10-30 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | systemd: Update to 227 | Eelco Dolstra | 2015-10-07 |
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into systemd-219 | Eelco Dolstra | 2015-10-01 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into systemd-219 | Eelco Dolstra | 2015-09-21 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into systemd-219 | Eelco Dolstra | 2015-09-07 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | stage-1: fix typo that breaks resume | Spencer Janssen | 2015-07-31 |
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/staging' into systemd-219 | Eelco Dolstra | 2015-07-20 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | Disable system_tarball_pc and fix eval | Eelco Dolstra | 2015-06-15 |
| | * | | | | | | | | | | | systemd: Use upstream tmpfiles.d rules | Tuomas Tynkkynen | 2015-06-03 |
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into systemd-219 | Eelco Dolstra | 2015-05-22 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | systemd: Update to 220 | Eelco Dolstra | 2015-05-22 |
| | * | | | | | | | | | | | | Set up /etc/machine-id before starting systemd | Eelco Dolstra | 2015-05-18 |
| | * | | | | | | | | | | | | stage-1: Shut up warnings about swap devices that don't exist yet | Eelco Dolstra | 2015-05-11 |
| | * | | | | | | | | | | | | Allow systemd-journald to be restarted | Eelco Dolstra | 2015-05-11 |
| | * | | | | | | | | | | | | stage-2: Don't run hwclock in containers | Eelco Dolstra | 2015-05-11 |
| | * | | | | | | | | | | | | stage-1: Don't mount /dev/shm if it's already mounted | Eelco Dolstra | 2015-05-11 |
| | * | | | | | | | | | | | | Create systemd-{network,resolve} user/group unconditionally | Eelco Dolstra | 2015-05-11 |
| | * | | | | | | | | | | | | Use ConditionVirtualization to disable some services in containers | Eelco Dolstra | 2015-05-11 |
| | * | | | | | | | | | | | | systemd: Update to 219 | Eelco Dolstra | 2015-05-11 |
| * | | | | | | | | | | | | | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-04 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-10-30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge master into staging | Vladimír Čunát | 2015-10-23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-10-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06" | Eelco Dolstra | 2015-10-06 |
| * | | | | | | | | | | | | | | | | Merge branch 'master.upstream' into staging.post-15.06 | William A. Kennington III | 2015-10-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |