Merge branch 'master' into 'master'

S10CB07 enabled

The configuration was changed by pollet

See merge request !60
This commit is contained in:
maerki_f
2017-07-25 08:18:42 +02:00
+2 -2
View File
@@ -30,9 +30,9 @@
,{"stream": "tcp://S10CB05-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB06-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB06-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB07-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB08-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB09-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"}