a3c803 Merge branch 'add_daffys' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'add_daffys' into 'production'
    
    daffy.i.o.o renamed to daffy1.i.o.o, add daffy2.i.o.o
    
    See merge request infra/salt!139
        
pillar/id/daffy1_infra_opensuse_org.sls pillar/id/daffy_infra_opensuse_org.sls
file renamed
file was renamed with no change to the file