Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

3ce4365f

Commit 3ce4365f authored 6 years ago by Sara Alderweireldt

Downloads
- Plain Diff

Merge branch '21.1_api' into '21.1'

Updates to TriggerAPI

See merge request atlas/athena!14500

Former-commit-id: d5c3fbe8741e2da6e35240c4b2aa0a66069e4a45

parents 14de85a9 f61e813d

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt 1 addition, 1 deletion

Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py 2 additions, 2 deletions

Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py
Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py 4 additions, 0 deletions

...TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py
Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py 4 additions, 3 deletions

Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py
Trigger/TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py 6 additions, 6 deletions

...TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py

with 17 additions and 12 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