be26bd Merge branch 'tests' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tests' into 'production'
    
    tests: improvements to get_valid_custom_grains, bugfix to prepare_test_env
    
    See merge request infra/salt!175
        
file modified
+2 -2