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

052873b0 · Nikolay Stanchev · 6e8847cd · bce122a6 · 052873b0 · 052873b0
Commit 052873b0 authored 7 years ago by Nikolay Stanchev
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 *__pycache__*
 *__init__.pyc
 *egg-info*
-ubuntu-xenial-16.04-cloudimg-console.log
\ No newline at end of file
+ubuntu-xenial-16.04-cloudimg-console.log
--- a/clmctest/services/apache/install.sh
+++ b/clmctest/services/apache/install.sh
--- a/clmctest/services/ffmpeg/install.sh
+++ b/clmctest/services/ffmpeg/install.sh
--- a/clmctest/services/ffmpeg/transcode.sh
+++ b/clmctest/services/ffmpeg/transcode.sh
--- a/clmctest/services/host/install.sh
+++ b/clmctest/services/host/install.sh
--- a/clmctest/services/ipendpoint/install.sh
+++ b/clmctest/services/ipendpoint/install.sh
--- a/clmctest/services/loadtest-streaming/install.sh
+++ b/clmctest/services/loadtest-streaming/install.sh
--- a/clmctest/services/mongo/install.sh
+++ b/clmctest/services/mongo/install.sh
--- a/clmctest/services/nginx/install.sh
+++ b/clmctest/services/nginx/install.sh
--- a/clmctest/services/pytest/install.sh
+++ b/clmctest/services/pytest/install.sh
--- a/clmctest/services/vlc/install.sh
+++ b/clmctest/services/vlc/install.sh
--- a/scripts/clmc-agent/configure.sh
+++ b/scripts/clmc-agent/configure.sh
@@ -24,7 +24,7 @@
 #//
 #/////////////////////////////////////////////////////////////////////////

-# Force fail on command fail
+# Force fail on command fail 
 set -euo pipefail

 echo "Configuring Telegraf agent general and output configuration"