4f4e93 Merge branch 'bashrc_hostusage' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
37 files changed. 121 lines added. 10 lines removed.
pillar/id/anna_infra_opensuse_org.sls
file modified
+5 -0
pillar/id/baloo_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/boosters_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/chip_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/community_infra_opensuse_org.sls
file modified
+7 -0
pillar/id/conference_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/daffy1_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/daffy2_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/dale_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/donald_infra_opensuse_org.sls
file removed
-5
pillar/id/duke_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/elsa_infra_opensuse_org.sls
file modified
+5 -0
pillar/id/etherpad_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/gaston_infra_opensuse_org.sls
file removed
-5
pillar/id/icc_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/keyserver1_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/kruemel_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/mickey_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/minnie_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/monitor_infra_opensuse_org.sls
file modified
+4 -0
pillar/id/mufasa_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/narwal2_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/narwal3_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/narwal_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/nuka_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/olaf_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/rafiki_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/redmine_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/riesling2_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/riesling_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/sarabi_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/scar_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/simba_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/water2_infra_opensuse_org.sls
file modified
+2 -0
pillar/id/water_infra_opensuse_org.sls
file modified
+2 -0
salt/profile/accounts/files/etc/bash.bashrc.local.jinja
file added
+37
salt/profile/accounts/init.sls
file modified
+5 -0
    Merge branch 'bashrc_hostusage' into 'production'
    
    add ability to print hostusage next to the PS1
    
    See merge request infra/salt!149