summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'ni/master' into HEADlassulus2017-07-254-60/+80
| |\ \
| * \ \ Merge remote-tracking branch 'gum/master' into HEADlassulus2017-07-254-138/+30
| |\ \ \ | | | |/ | | |/|
| | * | buildbot: override sources instead of repackagemakefu2017-07-254-127/+29
| | * | buildbot-slave-classic -> buildbot-classic-slavemakefu2017-07-241-0/+0
| | * | Merge remote-tracking branch 'lass/master'makefu2017-07-241-1/+1
| | |\ \
| | * | | buildbot-slave-classic: take buildbot-classic as argumentmakefu2017-07-241-2/+2
| | * | | mv buildbot{-classic,}makefu2017-07-244-10/+5
| | * | | buildbot: bump to new stagingmakefu2017-07-242-14/+9
| * | | | Merge remote-tracking branch 'gum/master'lassulus2017-07-242-4/+4
| |\| | |
| | * | | buildbot: bump to 38b780ee6makefu2017-07-242-4/+4
| * | | | Merge remote-tracking branch 'gum/master'lassulus2017-07-235-15/+137
| |\| | | | | |/ / | |/| |
| | * | buildbot-slave: use buildbot-classicmakefu2017-07-231-11/+10
| | * | buildbot: use buildbot-classic from stagingmakefu2017-07-231-24/+12
| | * | buildbot: cherry-pick working buildbot-classic definition from nixpkgsmakefu2017-07-234-14/+150
| | * | shoney: do not deploy torrentmakefu2017-07-231-1/+0
* | | | shell: add --force-populate flagtv2017-07-271-5/+14
* | | | populate: 1.2.0 -> 1.2.1tv2017-07-271-2/+2
| |_|/ |/| |
* | | infest prepare: drop support for CentOS 6tv2017-07-251-11/+0
* | | writeOut: don't modify stdenv's shelltv2017-07-251-2/+7
* | | shell: set NIX_REMOTE only if daemon-socket existstv2017-07-251-1/+3
* | | infest prepare nix: 1.10 -> 1.11.13tv2017-07-251-2/+2
* | | infest prepare: sed NIX_PATH more lenient everywheretv2017-07-251-1/+1
* | | Makefile: reimplement install using shelltv2017-07-251-13/+2
* | | shell: add install commandtv2017-07-251-0/+42
* | | shell: split init.proxy off from init.envtv2017-07-251-30/+23
|/ /
* / krebs test-all-krebs-modules: worker -> slavelassulus2017-07-231-1/+1
|/
* Revert "buildbot: 0.8.4 -> 0.9.0rc2"lassulus2017-07-238-236/+136
* l: add container-networking.nixlassulus2017-07-232-0/+28
* l buildbot: build hotdoglassulus2017-07-231-1/+1
* l prism: add hotdog containerlassulus2017-07-231-0/+15
* Merge remote-tracking branch 'gum/master'lassulus2017-07-234-7/+69
|\
| * Merge remote-tracking branch 'lass/master'makefu2017-07-2322-116/+248
| |\
| * | repo-sync: bump to 0.2.7makefu2017-07-231-5/+7
| * | ma: tag managed hostsmakefu2017-07-232-1/+17
| * | ma zsh: enable completion for brain, add ctrl-tmakefu2017-07-231-1/+45
* | | lass: cleanuplassulus2017-07-237-172/+73
| |/ |/|
* | krebs: init hotdoglassulus2017-07-233-0/+44
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-232-0/+37
|\ \
| * | tv pkgs simple: add missing default.nixtv2017-07-231-0/+24
| * | tv nginx krebs-pages: inittv2017-07-231-0/+13
* | | krebs puyak: use hw/x220lassulus2017-07-231-4/+1
* | | krebs hw: init x220.nixlassulus2017-07-231-0/+29
* | | Merge remote-tracking branch 'gum/master'lassulus2017-07-234-1/+66
|\ \ \ | |/ / |/| / | |/
| * wolf,puyak: refactor stats collectionmakefu2017-07-234-1/+66
| * Merge branch 'master' of prism:stockholmmakefu2017-07-2320-226/+327
| |\
* | | Merge remote-tracking branch 'gum/master'lassulus2017-07-232-22/+22
|\| |
| * | ma: refactor module loading of 5pkgsmakefu2017-07-232-22/+22
* | | Merge remote-tracking branch 'ni/master'lassulus2017-07-2314-98/+107
|\ \ \
| * | | writeJSON: pretty-print outputtv2017-07-231-1/+6
| * | | tv pkgs: mimic krebs' simple overlaytv2017-07-237-20/+11