Merge branch 'clmcservice' of gitlab.it-innovation.soton.ac.uk:FLAME/flame-clmc into integration (9267fac1) · 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

9267fac1

Commit 9267fac1 authored 6 years ago by MJB

Downloads
- Plain Diff

Merge branch 'clmcservice' of gitlab.it-innovation.soton.ac.uk:FLAME/flame-clmc into integration

parents fd621378 553fec8c

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

scripts/clmc-service/install.sh 14 additions, 0 deletions

scripts/clmc-service/install.sh
src/service/clmcservice/__init__.py 0 additions, 5 deletions

src/service/clmcservice/__init__.py
src/service/clmcservice/aggregator.py 56 additions, 53 deletions

src/service/clmcservice/aggregator.py
src/service/clmcservice/tests.py 32 additions, 22 deletions

src/service/clmcservice/tests.py
src/service/clmcservice/views.py 48 additions, 19 deletions

src/service/clmcservice/views.py
src/service/development.ini 30 additions, 8 deletions

src/service/development.ini
src/service/production.ini 30 additions, 9 deletions

src/service/production.ini
src/service/setup.py 1 addition, 0 deletions

src/service/setup.py
src/test/clmctest/monitoring/E2ETestAggregatorThread.py 1 addition, 1 deletion

src/test/clmctest/monitoring/E2ETestAggregatorThread.py

with 212 additions and 117 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