145013 Merge branch 'tampakrap_addrm_boxes' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tampakrap_addrm_boxes' into 'production'
    
    add/remove machines based on last week's split
    
    See merge request !29
        
pillar/id/anna_infra_opensuse_org.sls pillar/id/disquss_infra_opensuse_org.sls
file renamed
file was renamed with no change to the file
pillar/id/elsa_infra_opensuse_org.sls pillar/id/ariel_infra_opensuse_org.sls
file renamed
file removed
-6
file removed
-1