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

6ccd5485

Commit 6ccd5485 authored 6 years ago by Nikolay Stanchev

Downloads
- Plain Diff

Merge remote-tracking branch 'origin' into clmcservice

parents ebdd5b6a f551d232

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

README.md 3 additions, 3 deletions

README.md
Vagrantfile 9 additions, 1 deletion

Vagrantfile
Vagrantfile.libvirt 8 additions, 0 deletions

Vagrantfile.libvirt
scripts/clmc-service/install.sh 2 additions, 2 deletions

scripts/clmc-service/install.sh
scripts/test/fixture.sh 37 additions, 1 deletion

scripts/test/fixture.sh
src/service/clmcservice/aggregation/aggregator.py 1 addition, 1 deletion

src/service/clmcservice/aggregation/aggregator.py
src/service/development.ini 2 additions, 2 deletions

src/service/development.ini
src/service/production.ini 4 additions, 4 deletions

src/service/production.ini
src/test/clmctest/rspec.json 7 additions, 1 deletion

src/test/clmctest/rspec.json

with 73 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