Merge branch 'integration' into 'master' (a0e7ead2) · 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

a0e7ead2

Commit a0e7ead2 authored 5 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'master'

Integration

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

parents 29e05406 2a2f5768

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
docs/clmc-service.md 157 additions, 32 deletions

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

src/service/VERSION
src/service/clmcservice/__init__.py 6 additions, 1 deletion

src/service/clmcservice/__init__.py
src/service/clmcservice/alertsapi/tests.py 147 additions, 29 deletions

src/service/clmcservice/alertsapi/tests.py
src/service/clmcservice/alertsapi/views.py 185 additions, 36 deletions

src/service/clmcservice/alertsapi/views.py
src/service/clmcservice/managementapi/__init__.py 0 additions, 0 deletions

src/service/clmcservice/managementapi/__init__.py
src/service/clmcservice/managementapi/tests.py 89 additions, 0 deletions

src/service/clmcservice/managementapi/tests.py
src/service/clmcservice/managementapi/views.py 82 additions, 0 deletions

src/service/clmcservice/managementapi/views.py
src/service/development.ini 5 additions, 17 deletions

src/service/development.ini
src/service/production.ini 6 additions, 14 deletions

src/service/production.ini
src/service/resources/GraphAPI/network_config.json 0 additions, 89 deletions

src/service/resources/GraphAPI/network_config.json
src/test/VERSION 1 addition, 1 deletion

src/test/VERSION
src/test/clmctest/alerts/test_alerts.py 114 additions, 22 deletions

src/test/clmctest/alerts/test_alerts.py

with 797 additions and 246 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