Merge branch 'hotfix_edm26' into 'master'

Adding option to EventDefinitionM26 to directly add the trigger ts information to the event

See merge request !445
21 jobs for master in 21 minutes and 24 seconds (queued for 7 seconds)
Status Name Job ID Coverage
  Compilation
passed cmp:cc7-docker #15245902
docker

00:08:24

passed cmp:cc7-gcc #15245880
docker

00:03:34

passed cmp:cc7-llvm #15245912
docker

00:04:40

passed cmp:cc8-gcc #15245874
docker

00:02:29

passed cmp:lxplus-gcc #15245896
docker

00:03:18

passed cmp:mac1015-clang #15245919
mac

00:03:32

 
  Testing
passed tst:align #15245929
docker

00:07:42

passed tst:io #15245932
docker

00:04:20

passed tst:sim #15245936
docker

00:03:11

passed tst:tracking #15245923
docker

00:05:17

 
  Formatting
passed fmt:cc7-llvm-lint #15245940
docker

00:18:10

passed fmt:centos7-llvm-format #15245939
docker

00:00:27

passed fmt:codespell #15245942
docker

00:00:52

 
  Documentation
passed cmp:doxygen #15245945
docker

00:01:10

passed cmp:usermanual #15245950
docker

00:01:53

 
  Packaging
passed pkg:cc7-gcc #15245954
docker

00:02:33

passed pkg:cc8-gcc #15245952
docker

00:01:43

passed pkg:mac1015-clang #15245956
mac

00:03:39

 
  Deployment
passed deploy-cvmfs #15245960
cvmfs-deploy

00:00:21

passed deploy-docker-latest #15245963
docker-image-build

00:03:11

passed deploy-eos #15245958
docker

00:00:09