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

04f7430a

Commit 04f7430a authored 7 years ago by MJB

Downloads
- Plain Diff

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

parents d156c8c9 1ed2a12f

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

clmctest/monitoring/rspec.yml 2 additions, 0 deletions

clmctest/monitoring/rspec.yml
docs/clmc-service.md 1 addition, 1 deletion

docs/clmc-service.md
scripts/clmc-service/install.sh 77 additions, 4 deletions

scripts/clmc-service/install.sh
src/clmc-webservice/development.ini 1 addition, 1 deletion

src/clmc-webservice/development.ini
src/clmc-webservice/production.ini 1 addition, 1 deletion

src/clmc-webservice/production.ini
src/clmc-webservice/setup.py 1 addition, 1 deletion

src/clmc-webservice/setup.py
src/clmc-webservice/tox.ini 1 addition, 1 deletion

src/clmc-webservice/tox.ini

with 84 additions and 9 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