eceb68 Merge branch 'cboltz-reboot-safe' into 'production'

Merged and Committed by Christian Boltz 3 years ago
48 files changed. 51 lines added. 2 lines removed.
bin/prepare_test_env.sh
file modified
+1 -1
bin/test_custom_grains.py
file modified
+1 -1
pillar/id/anna_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/baloo_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/boosters_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/chip_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/community_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/crtmgr_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/daffy1_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/daffy2_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/dale_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/duke_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/elsa_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/etherpad_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/gcc2_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/icc_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/keyserver1_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/kruemel_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/kubic_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/lnt_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/metrics_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/mickey_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/minnie_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/monitor_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/mufasa_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/narwal2_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/narwal3_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/narwal5_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/narwal6_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/narwal7_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/narwal_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/nuka_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/obsreview_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/olaf_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/pontifex2_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/progress_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/rafiki_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/redmine_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/riesling2_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/riesling_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/rpmlint_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/sarabi_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/scar_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/simba_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/tsp_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/water2_infra_opensuse_org.sls
file modified
+1 -0
pillar/id/water_infra_opensuse_org.sls
file modified
+1 -0
pillar/valid_custom_grains.yaml
file modified
+4 -0
    Merge branch 'cboltz-reboot-safe' into 'production'
    
    Add "reboot_safe: unknown" to all pillar/id/ files
    
    See merge request infra/salt!241
        
file modified
+1 -1
file modified
+1 -1