9df794 Merge branch 'merge_formulas_list' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'merge_formulas_list' into 'production'
    
    use FORMULAS.yaml to generate the list of formulas in saltmaster's config
    
    See merge request infra/salt!161
        
file added
+1
file modified
+1 -1
file modified
+2 -2
pillar/FORMULAS.yaml FORMULAS.yaml
file renamed
file was renamed with no change to the file
file modified
+5 -20