f2885f Merge branch 'cboltz-elasticsearch-workaround' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'cboltz-elasticsearch-workaround' into 'production'
    
    add workaround for wrong pillar lookup in elasticsearch-formula
    
    See merge request infra/salt!115
        
file modified
+3 -1
file modified
+3 -0