5de19f Merge branch 'rename_keyserver_one' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'rename_keyserver_one' into 'production'
    
    keyserver.i.o.o renamed to keyserver1.i.o.o
    
    See merge request infra/salt!141
        
pillar/id/keyserver1_infra_opensuse_org.sls pillar/id/keyserver_infra_opensuse_org.sls
file renamed
file was renamed with no change to the file