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

929dd84b

Commit 929dd84b authored 6 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'master'

Integration

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

parents 1ee547e1 e3fc9dde

No related branches found

Tags 2.4.1

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

docs/clmc-service.md 133 additions, 35 deletions

docs/clmc-service.md
src/service/clmcservice/__init__.py 2 additions, 1 deletion

src/service/clmcservice/__init__.py
src/service/clmcservice/alertsapi/tests.py 363 additions, 77 deletions

src/service/clmcservice/alertsapi/tests.py
src/service/clmcservice/alertsapi/views.py 288 additions, 69 deletions

src/service/clmcservice/alertsapi/views.py
src/test/clmctest/alerts/conftest.py 1 addition, 33 deletions

src/test/clmctest/alerts/conftest.py
src/test/clmctest/alerts/test_alerts.py 165 additions, 5 deletions

src/test/clmctest/alerts/test_alerts.py
src/test/clmctest/services/minio/install.sh 2 additions, 0 deletions

src/test/clmctest/services/minio/install.sh

with 954 additions and 220 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