Merge branch 'integration' into 'master' (c5673cdc) · Commits · flame / flame-clmc · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

flame-clmc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

c5673cdc

Commit c5673cdc authored 6 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'master'

Integration

See merge request FLAME/consortium/3rdparties/flame-clmc!68

parents 929dd84b 8b30dc41

No related branches found

Tags 2.4.1

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
IPRREGISTRY.md 1 addition, 0 deletions

IPRREGISTRY.md
docs/clmc-service.md 29 additions, 2 deletions

docs/clmc-service.md
src/service/VERSION 1 addition, 1 deletion

src/service/VERSION
src/service/clmcservice/alertsapi/alerts_specification_schema.py 1 addition, 1 deletion

...vice/clmcservice/alertsapi/alerts_specification_schema.py
src/service/clmcservice/graphapi/tests.py 131 additions, 15 deletions

src/service/clmcservice/graphapi/tests.py
src/service/clmcservice/graphapi/utilities.py 3 additions, 2 deletions

src/service/clmcservice/graphapi/utilities.py
src/service/clmcservice/graphapi/views.py 62 additions, 10 deletions

src/service/clmcservice/graphapi/views.py
src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml 1 addition, 1 deletion

.../test-data/clmc-validator/valid/alerts_test_config-3.yaml
src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml 1 addition, 1 deletion

.../test-data/clmc-validator/valid/alerts_test_config-4.yaml
src/service/setup.py 1 addition, 0 deletions

src/service/setup.py
src/test/VERSION 1 addition, 1 deletion

src/test/VERSION

with 236 additions and 38 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