Merge branch 'integration' into 'master'
Integration into master branch See merge request FLAME/flame-clmc!47
Showing
- docs/AlertsSpecification.md 14 additions, 12 deletionsdocs/AlertsSpecification.md
- docs/clmc-service.md 2 additions, 2 deletionsdocs/clmc-service.md
- scripts/clmc-service/nginx.conf 5 additions, 5 deletionsscripts/clmc-service/nginx.conf
- src/service/clmcservice/__init__.py 2 additions, 0 deletionssrc/service/clmcservice/__init__.py
- src/service/clmcservice/alertsapi/alerts_specification_schema.py 7 additions, 4 deletions...vice/clmcservice/alertsapi/alerts_specification_schema.py
- src/service/clmcservice/alertsapi/tests.py 3 additions, 1 deletionsrc/service/clmcservice/alertsapi/tests.py
- src/service/clmcservice/alertsapi/utilities.py 4 additions, 1 deletionsrc/service/clmcservice/alertsapi/utilities.py
- src/service/clmcservice/alertsapi/views.py 4 additions, 1 deletionsrc/service/clmcservice/alertsapi/views.py
- src/service/clmcservice/tweens.py 36 additions, 0 deletionssrc/service/clmcservice/tweens.py
- src/service/resources/TICKscript/deadman-template.tick 2 additions, 1 deletionsrc/service/resources/TICKscript/deadman-template.tick
- src/service/resources/TICKscript/relative-template.tick 2 additions, 1 deletionsrc/service/resources/TICKscript/relative-template.tick
- src/service/resources/TICKscript/threshold-batch-template.tick 2 additions, 1 deletion...ervice/resources/TICKscript/threshold-batch-template.tick
- src/service/resources/TICKscript/threshold-stream-template.tick 1 addition, 0 deletions...rvice/resources/TICKscript/threshold-stream-template.tick
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml 2 additions, 2 deletions...est-data/clmc-validator/invalid/alerts_test_config-1.yaml
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml 2 additions, 2 deletions...st-data/clmc-validator/invalid/alerts_test_config-10.yaml
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml 2 additions, 2 deletions...st-data/clmc-validator/invalid/alerts_test_config-11.yaml
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml 2 additions, 2 deletions...st-data/clmc-validator/invalid/alerts_test_config-12.yaml
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml 2 additions, 2 deletions...est-data/clmc-validator/invalid/alerts_test_config-2.yaml
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml 2 additions, 2 deletions...est-data/clmc-validator/invalid/alerts_test_config-3.yaml
- src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml 2 additions, 2 deletions...est-data/clmc-validator/invalid/alerts_test_config-4.yaml
Loading
Please register or sign in to comment