summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:krebscode/painloadmakefu2013-04-0410-3/+129
|\
| * Merge branch 'master' of https://github.com/krebscode/painloadmakefu2013-03-281-0/+10
| |\
| | * retiolum/hosts/ohz: rm empty linetv2013-03-271-1/+0
| | * retiolum/hosts: add ohztv2013-03-271-0/+11
| * | add working graphite clientmakefu2013-03-281-1/+2
| |/
| * add graphite clientmakefu2013-03-221-0/+4
| * add shbrueckemakefu2013-03-171-0/+12
| * add alarmpimakefu2013-03-161-0/+11
| * Merge branch 'master' of https://github.com/krebscode/painloadmakefu2013-03-152-2/+0
| |\
| | * removed Compressionlassulus2013-03-122-2/+0
| * | update pigstartermakefu2013-03-151-1/+1
| * | add new krebsplugmakefu2013-03-151-0/+10
| |/
| * emergency commitroot2013-03-072-0/+80
* | Merge branch 'master' of github.com:krebscode/painloadmakefu2013-03-07224-2809/+910
|\|
| * Merge branch 'master' of https://github.com/krebscode/painloadmakefu2013-02-26179-2798/+16
| |\
| | * minikrebs is now a submodulemakefu2013-02-23175-2708/+3
| | * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-02-221-0/+1
| | |\
| | | * services authorized_keys: add retiolum@ireroot2013-02-221-0/+1
| | * | rm obsolete dict.leo.org scrapertv2013-02-221-87/+0
| | |/
| | * retiolum/hosts/irc -> ire2tv2013-02-221-0/+0
| | * retiolum/hosts/irc: initial commitroot2013-02-221-0/+9
| | * added slowpoke to bootstraplassulus2013-02-141-0/+1
| | * added lassuluslassulus2013-02-141-0/+1
| | * fix update-services-pubkeysroot2013-02-141-3/+1
| * | add wookBoxmakefu2013-02-261-0/+10
| |/
| * create routine to update ssh_authorized_keys via sshroot2013-02-142-1/+9
| * //services/bin/services: propagate ssh's exit codetv2013-02-081-5/+12
| * //services test-server: exit 0root2013-02-081-0/+3
| * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-02-085-6/+59
| |\
| | * Merge branch 'master' of https://github.com/krebscode/painloadtimm2013-02-081-4/+14
| | |\
| | | * added comments and better stringsplitlassulus2013-02-081-4/+14
| | * | print message after building for the mr3020, tootimm2013-02-081-0/+8
| | |/
| | * Merge branch 'master' of https://github.com/krebscode/painloadmakefu2013-02-0822-0/+340
| | |\
| | * | add nodes-to-json: parses retiolum/hosts folder into jsonmakefu2013-02-083-2/+37
| * | | services authorized_keys: add retiolum@nomictv2013-02-081-0/+1
| | |/ | |/|
| * | Merge branch 'master' of github.com:krebscode/painloadmakefu2013-02-0740-27/+440
| |\ \
| | * | added ircbotlassulus2013-02-072-0/+73
| | * | retiolum/hosts/nomic2: test dummytv2013-02-051-0/+10
| | * | added Discordius (lassulus' Bruder)lassulus2013-02-031-0/+11
| | * | //retiolum list-known-public-addresses: don't check if onlinetv2013-02-021-1/+1
| | * | //retiolum list-known-public-addresses: add online filtertv2013-02-021-1/+7
| | * | //retiolum list-known-public-addresses: factorizetv2013-02-021-21/+25
| | * | //util geo: initial committv2013-02-023-0/+70
| | * | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-02-023-9/+14
| | |\|
| | | * //retiolum patch-retiolum-hosts: allow --reverseroot2013-01-313-9/+14
| | * | //retiolum list-known-public-addresses: initial committv2013-02-021-0/+28
| | |/
| | * //retiolum update-retiolum-hosts: s/cp/rsync/root2013-01-311-2/+2
| | * //retiolum update-retiolum-hosts: don't HUP/ALRM tincdroot2013-01-311-2/+0
| | * //retiolum update_tinc_hosts: don't modify PATHroot2013-01-311-2/+6
| | * removed alphalabs addresslassulus2013-01-311-1/+0