summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | k 5 Reaktor/plugins: converted plugins from makefu/2/Reaktormakefu2015-12-2612-194/+102
| * | m 3 buildbot/master: use genidmakefu2015-12-261-1/+1
| * | Merge remote-tracking branch 'cd/master'makefu2015-12-2629-92/+82
| |\|
* | | l 5 newsbot-js: rev 6ee4884 -> 802b172lassulus2015-12-261-2/+2
* | | l 2: move pkgs from xserver to baseXlassulus2015-12-262-16/+7
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-2611-12/+70
|\| |
| * | m 3 Reaktor: add workdir/state_dirmakefu2015-12-261-1/+10
| * | k 5 Reaktor: init plugin infrastructuremakefu2015-12-253-0/+46
| * | m 1 gum: enable urlwatch servicemakefu2015-12-242-3/+3
| * | m 2 urlwatch: add cvs2svn to watchlistmakefu2015-12-241-1/+1
| * | s 2 buildbot: add treestabletimermakefu2015-12-242-3/+6
| * | k 5 cacpanel: bump version to 0.2.3makefu2015-12-242-4/+4
* | | Merge remote-tracking branch 'cd/master'lassulus2015-12-2629-92/+82
|\ \ \ | | |/ | |/|
| * | {pkgs => lib}.genidtv2015-12-2630-93/+83
* | | l 1 mors: add wordpress/owncloud testlassulus2015-12-261-5/+31
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-2421-299/+708
|\ \ \ | | |/ | |/|
| * | k 5 test/infest*: up limit of final connectmakefu2015-12-241-1/+1
| * | k 3 buildbot.master: refactormakefu2015-12-242-131/+317
| * | k 3 buildbot: add rsync as explicit depmakefu2015-12-231-6/+11
| * | k 3 buildbot/master: send sigterm before sigkill for cleanupmakefu2015-12-231-2/+4
| * | k 3 buildbot: fix merge fuckupmakefu2015-12-231-5/+0
| * | Merge remote-tracking branch 'cd/master'makefu2015-12-231-1/+6
| |\|
| | * tv wu: services.bitlbee.plugins += fbtv2015-12-231-1/+6
| * | k 5 test/infest*: remove batch mode from cac ssh callmakefu2015-12-231-1/+0
| * | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2015-12-231-0/+5
| |\ \
| | * | m 3 buildbot: add new slow factory to complete integration testmakefu2015-12-232-20/+35
| * | | k 5 mv krebs-ci test/infest-cac-centos7makefu2015-12-234-12/+19
| * | | m 3 buildbot: add new slow factory to complete integration testmakefu2015-12-233-21/+40
| |/ /
| * | k 5 krebs-ci: set cache files manuallymakefu2015-12-221-4/+9
| * | s 1 test-failing: add for CImakefu2015-12-221-0/+6
| * | k 5 krebs-ci: remove obsolete trap rmmakefu2015-12-222-2/+2
| * | Makefile: fail if nix-instantiate failsmakefu2015-12-221-3/+4
| * | mv makefu->krebs 3 buildbotmakefu2015-12-227-18/+38
| * | m 2 base: build user defaults to sharedmakefu2015-12-222-3/+1
| * | Merge remote-tracking branch 'cd/master'makefu2015-12-222-9/+12
| |\|
| | * cac: 1.0.2 -> 1.0.3tv2015-12-201-5/+8
| | * cac: 1.0."0" -> 1.0.2tv2015-12-201-8/+5
| | * Merge remote-tracking branch 'gum/master'tv2015-12-20101-636/+3220
| | |\
| | * | tv git: add repo soundcloudtv2015-12-201-0/+3
| * | | s 2 base: fix user,pubkey,secrets pathmakefu2015-12-221-2/+4
| * | | m 2 default: bump revisionmakefu2015-12-221-1/+1
| * | | k 5 krebs-ci: initial commitmakefu2015-12-222-0/+148
| * | | s 1 test-centos7: prepare for cimakefu2015-12-224-3/+6
| | |/ | |/|
* | | l 2 base: nixpkgs rev: 363c843 -> 93d8671lassulus2015-12-211-1/+1
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-208-58/+101
|\| |
| * | s 1 test-centos7: prepare to use generated networkingmakefu2015-12-191-18/+2
| * | k 5 cac: bump versionmakefu2015-12-191-3/+3
| * | m 2 git/brain-retiolum: remove obsolete usersmakefu2015-12-171-10/+1
| * | m 3 buildbot.slave: add to importsmakefu2015-12-161-0/+1
| * | m 3 buildbot.master: only alert on state changemakefu2015-12-161-3/+3