Merge branch 'develop' into 'getting_things_to_work'
# Conflicts: # geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py # geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py # geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- geant_service_orchestrator/__init__.py 0 additions, 0 deletionsgeant_service_orchestrator/__init__.py
- geant_service_orchestrator/main.py 2 additions, 2 deletionsgeant_service_orchestrator/main.py
- geant_service_orchestrator/products/__init__.py 8 additions, 4 deletionsgeant_service_orchestrator/products/__init__.py
- geant_service_orchestrator/products/product_blocks/trunk.py 10 additions, 3 deletionsgeant_service_orchestrator/products/product_blocks/trunk.py
- geant_service_orchestrator/products/product_blocks/trunk_config.py 12 additions, 4 deletions...vice_orchestrator/products/product_blocks/trunk_config.py
- geant_service_orchestrator/products/product_blocks/trunk_config_common.py 13 additions, 4 deletions...chestrator/products/product_blocks/trunk_config_common.py
- geant_service_orchestrator/products/product_blocks/trunk_config_side.py 13 additions, 4 deletions...orchestrator/products/product_blocks/trunk_config_side.py
- geant_service_orchestrator/products/product_types/trunk.py 11 additions, 4 deletionsgeant_service_orchestrator/products/product_types/trunk.py
- geant_service_orchestrator/products/product_types/trunk_config.py 12 additions, 4 deletions...rvice_orchestrator/products/product_types/trunk_config.py
- geant_service_orchestrator/products/product_types/trunk_config_common.py 13 additions, 4 deletions...rchestrator/products/product_types/trunk_config_common.py
- geant_service_orchestrator/products/product_types/trunk_config_side.py 13 additions, 4 deletions..._orchestrator/products/product_types/trunk_config_side.py
- geant_service_orchestrator/workflows/__init__.py 24 additions, 8 deletionsgeant_service_orchestrator/workflows/__init__.py
- geant_service_orchestrator/workflows/trunk/create_trunk.py 20 additions, 8 deletionsgeant_service_orchestrator/workflows/trunk/create_trunk.py
- geant_service_orchestrator/workflows/trunk/terminate_trunk.py 10 additions, 6 deletions...t_service_orchestrator/workflows/trunk/terminate_trunk.py
- geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py 35 additions, 14 deletions...rchestrator/workflows/trunk_config/create_trunk_config.py
- geant_service_orchestrator/workflows/trunk_config/terminate_trunk_config.py 10 additions, 5 deletions...estrator/workflows/trunk_config/terminate_trunk_config.py
- geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py 48 additions, 19 deletions...rkflows/trunk_config_common/create_trunk_config_common.py
- geant_service_orchestrator/workflows/trunk_config_common/terminate_trunk_config_common.py 15 additions, 8 deletions...lows/trunk_config_common/terminate_trunk_config_common.py
- geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py 46 additions, 17 deletions...r/workflows/trunk_config_side/create_trunk_config_side.py
Loading
Please register or sign in to comment