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

9af9483f

Commit 9af9483f authored Feb 9, 2018 by Rowan Powell

Downloads
- Plain Diff

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

michael has added new scripts

parents 10e9314f e5598326

No related branches found

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

test/services/ffmpeg/install-ffmpeg.sh 14 additions, 0 deletions

test/services/ffmpeg/install-ffmpeg.sh
test/services/ffmpeg/telegraf_ffmpeg_template.conf 112 additions, 0 deletions

test/services/ffmpeg/telegraf_ffmpeg_template.conf
test/services/ffmpeg/transcode.sh 31 additions, 0 deletions

test/services/ffmpeg/transcode.sh

with 157 additions and 0 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