Merge remote-tracking branch 'origin/master' into staging
[mirror/dsa-puppet.git] / modules / roles / manifests / planet_master.pp
2018-07-20 Martin Zobel-HelasMerge remote-tracking branch 'origin/master' into staging
2018-02-15 Martin Zobel-HelasMerge remote-tracking branch 'zobel-salsa/zobel-salsa'
2018-02-15 Martin Zobel-HelasMerge branch 'zobel-salsa'
2018-02-14 Aurelien Jarnoplanet-d.o: fix a thinko in my previous commit
2018-02-14 Aurelien Jarnoplanet-d.o: only allow access from localhost and local IP
2018-01-08 Peter PalfraderMerge branch 'master' into staging
2017-12-01 Julien CristauAdd planet_master role and planet-master.d.o vhost