Merge branch 'master' into 'master' (a5172b43) · Commits · hammonds / dm-docs · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dm-docs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a5172b43

Commit a5172b43 authored 5 years ago by sveseli

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Bug Fixes and Utility Updates

See merge request DM/dm!6

parents 6f7ab364 ce145e87

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

etc/daq-web-service.conf.template 4 additions, 3 deletions

etc/daq-web-service.conf.template
sbin/11IDB/dm_11idb_system_test_daq.sh 1 addition, 1 deletion

sbin/11IDB/dm_11idb_system_test_daq.sh
sbin/11IDB/dm_11idb_system_test_upload.sh 1 addition, 1 deletion

sbin/11IDB/dm_11idb_system_test_upload.sh
sbin/11IDC/dm_11idc_system_test_daq.sh 1 addition, 1 deletion

sbin/11IDC/dm_11idc_system_test_daq.sh
sbin/11IDC/dm_11idc_system_test_upload.sh 1 addition, 1 deletion

sbin/11IDC/dm_11idc_system_test_upload.sh
sbin/17BM/dm_17bm_system_test_daq.sh 1 addition, 1 deletion

sbin/17BM/dm_17bm_system_test_daq.sh
sbin/17BM/dm_17bm_system_test_upload.sh 1 addition, 1 deletion

sbin/17BM/dm_17bm_system_test_upload.sh
sbin/dm_remove_catalog_duplicates.sh 3 additions, 3 deletions

sbin/dm_remove_catalog_duplicates.sh
sbin/dm_station_upgrade_stage4.sh 1 addition, 1 deletion

sbin/dm_station_upgrade_stage4.sh
src/python/dm/common/objects/daqInfo.py 2 additions, 1 deletion

src/python/dm/common/objects/daqInfo.py

with 16 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment