Merge branch 'fms-mon' into 'integration' (5cb405b5) · 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

5cb405b5

Commit 5cb405b5 authored 7 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'fms-mon' into 'integration'

Fms mon

See merge request FLAME/flame-clmc!10

parents 28f13960 ccfd8703

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Vagrantfile 4 additions, 5 deletions

Vagrantfile
infra/streaming/rspec.yml 17 additions, 0 deletions

infra/streaming/rspec.yml
test/services/apache/install-apache.sh 11 additions, 3 deletions

test/services/apache/install-apache.sh
test/services/ffmpeg/telegraf_ffmpeg_template.conf 1 addition, 1 deletion

test/services/ffmpeg/telegraf_ffmpeg_template.conf
test/services/ffmpeg/transcode.sh 10 additions, 7 deletions

test/services/ffmpeg/transcode.sh
test/services/ipendpoint/telegraf_ipendpoint_template.conf 1 addition, 1 deletion

test/services/ipendpoint/telegraf_ipendpoint_template.conf
test/services/mongo/telegraf_mongo_template.conf 1 addition, 1 deletion

test/services/mongo/telegraf_mongo_template.conf
test/services/vlc/install-vlc.sh 29 additions, 0 deletions

test/services/vlc/install-vlc.sh
test/services/vlc/telegraf_vlc_template.conf 112 additions, 0 deletions

test/services/vlc/telegraf_vlc_template.conf
test/streaming/manual.md 57 additions, 4 deletions

test/streaming/manual.md

with 243 additions and 22 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