Merge branch 'clmc-service' into 'integration' (1dbfd0f6) · 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

1dbfd0f6

Commit 1dbfd0f6 authored 6 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'clmc-service' into 'integration'

Update for integration between CLMC and FLIPS

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

parents 93367bb0 6a79f381

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

scripts/clmc-service/nginx.conf 9 additions, 0 deletions

scripts/clmc-service/nginx.conf
src/service/clmcservice/alertsapi/tests.py 1 addition, 1 deletion

src/service/clmcservice/alertsapi/tests.py
src/service/clmcservice/alertsapi/views.py 1 addition, 1 deletion

src/service/clmcservice/alertsapi/views.py

with 11 additions and 2 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