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

1ee547e1

Commit 1ee547e1 authored 6 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'master'

Integration

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

parents 07718db4 d2e95b26

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
scripts/clmc-service/install-clmc-service.sh 2 additions, 1 deletion

scripts/clmc-service/install-clmc-service.sh
src/service/VERSION 1 addition, 1 deletion

src/service/VERSION
src/service/clmcservice/graphapi/conftest.py 3 additions, 0 deletions

src/service/clmcservice/graphapi/conftest.py
src/service/clmcservice/graphapi/views.py 24 additions, 7 deletions

src/service/clmcservice/graphapi/views.py
src/test/VERSION 1 addition, 1 deletion

src/test/VERSION

with 35 additions and 14 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