Merge remote-tracking branch 'origin' into clmcservice (6a8c3cd0) · 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

6a8c3cd0

Commit 6a8c3cd0 authored 6 years ago by Nikolay Stanchev

Downloads
- Plain Diff

Merge remote-tracking branch 'origin' into clmcservice

parents 24acf264 cb8c8a24

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Vagrantfile 1 addition, 1 deletion

Vagrantfile
clmctest/monitoring/E2ESim.py 3 additions, 3 deletions

clmctest/monitoring/E2ESim.py
clmctest/monitoring/rspec.yml 3 additions, 0 deletions

clmctest/monitoring/rspec.yml
clmctest/services/pytest/install.sh 2 additions, 1 deletion

clmctest/services/pytest/install.sh
docs/clmc-information-model.md 1 addition, 1 deletion

docs/clmc-information-model.md
scripts/clmc-service/install.sh 31 additions, 4 deletions

scripts/clmc-service/install.sh
src/clmcwebservice/clmcservice/aggregator.py 14 additions, 4 deletions

src/clmcwebservice/clmcservice/aggregator.py
src/clmcwebservice/production.ini 3 additions, 1 deletion

src/clmcwebservice/production.ini

with 58 additions and 15 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