794927 Merge branch 'cboltz-move-osmajorrelease' into 'production'

Merged and Committed by lrupp a year ago
    Merge branch 'cboltz-move-osmajorrelease' into 'production'
    
    get rid of osmajorrelease/*.sls
    
    See merge request infra/salt!508
        
file modified
+19 -0
file modified
+4 -1
pillar/osfullname/SLES/11.sls pillar/osmajorrelease/11.sls
file renamed
file was renamed with no change to the file
pillar/osfullname/SLES/12.sls pillar/osmajorrelease/12.sls
file renamed
file was renamed with no change to the file
pillar/osfullname/openSUSE_Tumbleweed.sls pillar/osmajorrelease/8.sls
file renamed
file was renamed with no change to the file
file modified
+0 -4