6a5284 Merge branch 'deploy_only_main_repo' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'deploy_only_main_repo' into 'production'
    
    Password protection for the update_fileserver reactor
    
    See merge request infra/salt!102
        
file modified
+1 -1
file modified
+3 -0
salt/profile/salt/files/etc/salt/master_minion_default_config salt/profile/salt/files/master_minion_default_config
file renamed
file was renamed with no change to the file
file modified
+9 -2
file modified
+1 -1