Merge branch '2.2.2' into release/2.2
No related branches found
No related tags found
Showing
- Makefile 3 additions, 0 deletionsMakefile
- doc/RELEASE_NOTES.txt 5 additions, 0 deletionsdoc/RELEASE_NOTES.txt
- doc/sphinx/source/conf.py 2 additions, 2 deletionsdoc/sphinx/source/conf.py
- etc/aps-db-web-service.conf.template 2 additions, 2 deletionsetc/aps-db-web-service.conf.template
- etc/daq-web-service.conf.template 1 addition, 0 deletionsetc/daq-web-service.conf.template
- etc/dm.deploy.conf 1 addition, 1 deletionetc/dm.deploy.conf
- etc/dm_dev.deploy.conf 11 additions, 15 deletionsetc/dm_dev.deploy.conf
- examples/workflow-example-01.py 64 additions, 0 deletionsexamples/workflow-example-01.py
- sbin/dm-db-add-user 17 additions, 0 deletionssbin/dm-db-add-user
- sbin/dm-db-add-user-system-role 18 additions, 0 deletionssbin/dm-db-add-user-system-role
- sbin/dm_create_db.sh 2 additions, 2 deletionssbin/dm_create_db.sh
- sbin/dm_deploy_aps_db_web_service.sh 214 additions, 0 deletionssbin/dm_deploy_aps_db_web_service.sh
- sbin/dm_deploy_cat_web_service.sh 1 addition, 1 deletionsbin/dm_deploy_cat_web_service.sh
- sbin/dm_deploy_daq_web_service.sh 1 addition, 1 deletionsbin/dm_deploy_daq_web_service.sh
- sbin/dm_deploy_ds_web_service.sh 36 additions, 39 deletionssbin/dm_deploy_ds_web_service.sh
- sbin/dm_deploy_proc_web_service.sh 1 addition, 1 deletionsbin/dm_deploy_proc_web_service.sh
- sbin/dm_deploy_test_system.sh 78 additions, 0 deletionssbin/dm_deploy_test_system.sh
- sbin/dm_remove_test_system.sh 50 additions, 0 deletionssbin/dm_remove_test_system.sh
- src/python/dm/__init__.py 1 addition, 1 deletionsrc/python/dm/__init__.py
- src/python/dm/aps_beamline_tools/gui/addExperiment.py 1 addition, 1 deletionsrc/python/dm/aps_beamline_tools/gui/addExperiment.py
Loading
Please register or sign in to comment