summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:krebscode/painloadlassulus2011-11-175-300/+158
|\
| * //punani: add README describing the current functionalityEUcancER2011-11-171-0/+30
| * //punani: rm old punani, tightnani->punaniEUcancER2011-11-174-329/+53
| * //tightnani-web: add error message:EUcancER2011-11-161-4/+9
| * //punani: db - add pip package managerEUcancER2011-11-161-1/+5
| * //punani: tightnani_client -> tinani, add packagesEUcancER2011-11-162-1/+25
| * Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-163-2/+64
| |\
| | * //punani: tightnani is now less verbosemakefu2011-11-161-2/+2
| | * Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-164-3/+9
| | |\
| | * | //punani/tightnani_client: initial commitmakefu2011-11-162-1/+64
| * | | //punani: tightnani-web is now able to handle fallback(super-) package managerEUcancER2011-11-162-1/+9
* | | | added defaultroutes!! testing ftwlassulus2011-11-173-0/+3
| |_|/ |/| |
* | | removed ALRMlassulus2011-11-161-1/+0
|/ /
* | Merge branch 'master' of github.com:krebscode/painloadlassulus2011-11-151-0/+9
|\ \
| * \ Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-152-0/+11
| |\ \
| * | | //monitoring: add new shinken monitoring stuffEUcancER2011-11-151-0/+9
* | | | deleted routes for testinglassulus2011-11-153-3/+0
| |/ / |/| |
* | | m0ar defaultroutes!lassulus2011-11-151-0/+1
| |/ |/|
* | Merge branch 'master' of github.com:krebscode/painloadlassulus2011-11-141-1/+5
|\|
| * Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-141-0/+1
| |\
| * | //cholerab/news/Candidate: add Ticket UpdateEUcancER2011-11-141-1/+5
* | | added host picolassulus2011-11-141-0/+10
| |/ |/|
* | Merge branch 'master' of github.com:krebscode/painloadlassulus2011-11-142-0/+59
|\|
| * //cholerab/news/Candidate: add 28c3 ticket fetchermakefu2011-11-141-0/+6
| * Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-146-0/+160
| |\
| * | //census: update Readmemakefu2011-11-141-3/+13
| * | //too_old: add script to fetch 28C3 ticketsmakefu2011-11-141-0/+53
* | | added default route Styxlassulus2011-11-141-0/+1
| |/ |/|
* | added portforwardinglassulus2011-11-141-1/+4
* | tincrouting ftw!lassulus2011-11-141-0/+6
* | added defaultroutelassulus2011-11-141-0/+1
* | //cholerab krebs-v2.xpm: initial committv2011-11-131-0/+24
* | Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-123-0/+126
|\ \
| * \ Merge branch 'master' of github.com:krebscode/painloadtv2011-11-128-8/+102
| |\ \
| | * | Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-111-0/+9
| | |\|
| | * | //punani/tightnani: initial commitEUcancER2011-11-112-0/+73
| * | | //cholerab/reports/Empera.txt: initial committv2011-11-111-0/+53
* | | | //census: update readmemakefu2011-11-121-3/+13
| |_|/ |/| |
* | | Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-115-8/+20
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-101-1/+1
| |\|
| * | //retiolum/adv_graphgen: refactor graph generation, fix weight issueEUcancER2011-11-103-8/+17
| * | .gitmodules: add python-irclib for ircbotsEUcancER2011-11-102-0/+3
* | | //infest/profiles: initial draft for profile depoyermakefu2011-11-111-0/+9
| |/ |/|
* | //retiolum hosts also controls 23.42/16tv2011-11-101-1/+1
|/
* //oncology: use 42/8tv2011-11-101-1/+1
* //retiolum hosts: killall Subnet = 10.7.7/24tv2011-11-1043-50/+0
* //retiolum tinc-up: first set up interface, then configuretv2011-11-101-2/+2
* //retiolum Makefile update: show unified contexttv2011-11-101-1/+1
* //retiolum pgrep-retiolum-tincd-args: fix regextv2011-11-101-1/+1
* //retiolum update: cp tinc-up and restart tincdtv2011-11-104-8/+24