43f1e3 Merge branch 'aedir_pillar_vars' into 'production'

Merged and Committed by Christian Boltz 3 years ago
    Merge branch 'aedir_pillar_vars' into 'production'
    
    explicitly note that AE-DIR test servers are not managed by salt
    
    See merge request infra/salt!245