Merge branch 'master' into 'master'

Master

See merge request alarm-server/alarm-server-config!226

alarm-01.tn.esss.lu.se/CDS.xml

@@ -15,6 +15,11 @@
       <latching>false</latching>
       <annunciating>true</annunciating>
     </pv>
+    <pv name="CrS-SHC::GlobalAlarm">
+      <description>Please check the SHC gate valves</description>
+      <latching>false</latching>        
+      <annunciating>true</annunciating>
+    </pv>
     <component name="SPK010 Cryomodule">
       <pv name="Spk-010Crm:Cryo-LT-001:HIHI">
         <description>LT-001 helium level extremely high</description>
@@ -455,7 +460,7 @@
         <annunciating>true</annunciating>
       </pv>
     </component>
-      <component name="MBL080 Cryomodule">
+    <component name="MBL080 Cryomodule">
       <pv name="MBL-080Crm:Cryo-LT-001:HIHI">
         <description>LT-001 helium level extremely high</description>
         <latching>false</latching>
@@ -477,7 +482,7 @@
         <annunciating>true</annunciating>
       </pv>
     </component>
-      <component name="MBL090 Cryomodule">
+    <component name="MBL090 Cryomodule">
       <pv name="MBL-090Crm:Cryo-LT-001:HIHI">
         <description>LT-001 helium level extremely high</description>
         <latching>false</latching>