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

5d88a34b

Commit 5d88a34b authored 6 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'master'

Integration

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

parents 7857523d f3bb57a5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 6 additions, 6 deletions

.gitlab-ci.yml
docs/clmc-service.md 1 addition, 1 deletion

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

src/service/VERSION
src/service/clmcservice/graphapi/conftest.py 25 additions, 5 deletions

src/service/clmcservice/graphapi/conftest.py
src/service/clmcservice/graphapi/tests.py 127 additions, 24 deletions

src/service/clmcservice/graphapi/tests.py
src/service/clmcservice/graphapi/utilities.py 30 additions, 31 deletions

src/service/clmcservice/graphapi/utilities.py
src/service/clmcservice/graphapi/views.py 67 additions, 81 deletions

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

src/test/VERSION

with 258 additions and 150 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