Merge branch 'master' into 'master'

flex keysight added See merge request sf_config/sf_daq_sources!91
2019-02-06 12:44:01 +01:00
parent 4ccfb71ca6 8ab5feb5ef
commit 24e8a8f9b9
1 changed files with 1 additions and 0 deletions
@@ -6,5 +6,6 @@
        ,{"stream": "tcp://SLAAR11-CVME-LAS6891:9999"}
        ,{"stream": "tcp://SARES11-CVME-PRIME1:9999"}
        ,{"stream": "tcp://SARES12-CVME-FLEX1:9999"}
+	,{"stream": "tcp://SARES12-CPCL-GES1:9999"}
    ]
 }