summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'miefda2015-12-3015-263/+263
|\
| * s 1 minimal-deploy: init testmakefu2015-12-302-0/+24
| * s 2 buildbot-standalone: cosmeticsmakefu2015-12-301-5/+6
| * s 1 test-all-krebs-modules: initmakefu2015-12-302-4/+58
| * m 3 buildbot/master: add secretsmakefu2015-12-301-3/+5
| * Merge remote-tracking branch 'gum/master'lassulus2015-12-294-6/+73
| |\
| | * Merge remote-tracking branch 'cd/master'makefu2015-12-284-6/+73
| | |\
| | | * {tv 2 => krebs 3} backuptv2015-12-284-242/+29
| | * | Merge remote-tracking branch 'cd/master'makefu2015-12-266-13/+9
| | |\ \
| * | | | Merge remote-tracking branch 'gum/master'lassulus2015-12-262-3/+6
| |\| | |
| | * | | s 2 buildbot: add treestabletimermakefu2015-12-242-3/+6
| * | | | Merge remote-tracking branch 'cd/master'lassulus2015-12-266-13/+9
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | k 3 buildbot.master: refactormakefu2015-12-241-4/+103
| * | | Merge remote-tracking branch 'cd/master'makefu2015-12-231-1/+6
| |\ \ \
| * | | | s 1 test-failing: add for CImakefu2015-12-221-0/+6
| * | | | Makefile: fail if nix-instantiate failsmakefu2015-12-221-3/+4
| * | | | mv makefu->krebs 3 buildbotmakefu2015-12-223-12/+32
| * | | | m 2 base: build user defaults to sharedmakefu2015-12-222-3/+1
| * | | | Merge remote-tracking branch 'cd/master'makefu2015-12-221-0/+3
| |\ \ \ \
| * | | | | s 2 base: fix user,pubkey,secrets pathmakefu2015-12-221-2/+4
| * | | | | s 1 test-centos7: prepare for cimakefu2015-12-224-3/+6
* | | | | | mi 2 git: bobby now verbosemiefda2015-12-301-1/+1
* | | | | | miefda: init with bobbymiefda2015-12-308-0/+288
| |_|_|_|/ |/| | | |
* | | | | tv backup: initial committv2015-12-283-0/+256
* | | | | tv: disable display-managertv2015-12-271-1/+1
* | | | | tv vim: ensure relevant dirs existtv2015-12-271-5/+29
| |_|_|/ |/| | |
* | | | {pkgs => lib}.genidtv2015-12-266-13/+9
| |_|/ |/| |
* | | tv wu: services.bitlbee.plugins += fbtv2015-12-231-1/+6
| |/ |/|
* | Merge remote-tracking branch 'gum/master'tv2015-12-2011-71/+391
|\|
| * s 1 test-centos7: prepare to use generated networkingmakefu2015-12-191-18/+2
| * s 1 wolf: provide graphitemakefu2015-12-161-0/+1
| * s 2 graphite: init configmakefu2015-12-161-0/+37
| * s 1 wolf: initial preparation of ci packagingmakefu2015-12-142-1/+13
| * s 2 drivedroid: update servicemakefu2015-12-041-11/+13
| * Merge remote-tracking branch 'cd/master'makefu2015-11-276-2/+92
| |\
| * \ Merge remote-tracking branch 'cloudkrebs/master'makefu2015-11-220-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'pnp/master'lassulus2015-11-214-1/+93
| | |\ \
| | * \ \ Merge remote-tracking branch 'cd/master'lassulus2015-11-2110-8/+1174
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'cd/master'lassulus2015-11-1711-0/+1210
| | |\ \ \ \
| * | \ \ \ \ Merge remote-tracking branch 'cd/master'makefu2015-11-2210-8/+1174
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| * | | | | unstable -> s 2 shack-drivedroidmakefu2015-11-181-3/+27
| * | | | | Merge remote-tracking branch 'cd/master'makefu2015-11-1711-0/+1210
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | shared 1 wolf: add self to binaryCachemakefu2015-11-171-0/+4
| * | | | | s 2 drivedroid: fix syntax errormakefu2015-11-171-2/+2
| * | | | | shared wolf: static ip, fix todomakefu2015-11-173-1/+63
| * | | | | shared 2 base: add makefu_omo to allowed pubkeysmakefu2015-11-171-0/+2
| | |_|/ / | |/| | |
| * | | | shared: add os templates to 2lassulus2015-11-132-0/+94
| * | | | move testhosts to shared from lasslassulus2015-11-133-0/+93
| * | | | shared: move stuff from 1/wolf.nix to 2/base.nixlassulus2015-11-132-70/+75
* | | | | tv git: add repo soundcloudtv2015-12-201-0/+3
| |_|_|/ |/| | |