From 26dc8480ee58ee2fa0c95b522e76c56d9ea01f25 Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Mon, 26 Mar 2018 10:14:10 +0100
Subject: [PATCH] merged integration with branch

---
 {test/streaming-sim => clmctest/monitoring}/test_MC_Config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename {test/streaming-sim => clmctest/monitoring}/test_MC_Config.py (96%)

diff --git a/test/streaming-sim/test_MC_Config.py b/clmctest/monitoring/test_MC_Config.py
similarity index 96%
rename from test/streaming-sim/test_MC_Config.py
rename to clmctest/monitoring/test_MC_Config.py
index 4497be6..e8e56df 100644
--- a/test/streaming-sim/test_MC_Config.py
+++ b/clmctest/monitoring/test_MC_Config.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 import pytest
-from StreamingSim import reportMC_ServiceState
+from clmctest.monitoring.StreamingSim import reportMC_ServiceState
 
 class TestMediaComponentConfig( object ):
     """
-- 
GitLab