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

29e05406

Commit 29e05406 authored 5 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'master'

Integration

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

parents e2c270b1 1b1d6543

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
docs/graph-monitoring-user-guide.md 241 additions, 0 deletions

docs/graph-monitoring-user-guide.md
scripts/clmc-service/graph-network-topology.sh 39 additions, 0 deletions

scripts/clmc-service/graph-network-topology.sh
scripts/clmc-service/graph-pipeline.sh 5 additions, 3 deletions

scripts/clmc-service/graph-pipeline.sh
scripts/clmc-service/install-clmc-service.sh 9 additions, 5 deletions

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

src/service/VERSION
src/service/clmcservice/graphapi/tests.py 23 additions, 22 deletions

src/service/clmcservice/graphapi/tests.py
src/service/clmcservice/graphapi/views.py 32 additions, 28 deletions

src/service/clmcservice/graphapi/views.py
src/service/development.ini 7 additions, 5 deletions

src/service/development.ini
src/service/production.ini 7 additions, 5 deletions

src/service/production.ini
src/service/resources/GraphAPI/network_clusters.json 4 additions, 4 deletions

src/service/resources/GraphAPI/network_clusters.json
src/service/resources/GraphAPI/network_ues.json 4 additions, 4 deletions

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

src/test/VERSION

with 377 additions and 82 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