commit e0796231bf6fd5b7d09d4a850227be7bc9bbdc6a
author stevenvanrossem <steven.vanrossem@intec.ugent.be> Wed Feb 08 12:25:53 2017 +0100
committer stevenvanrossem <steven.vanrossem@intec.ugent.be> Wed Feb 08 12:25:53 2017 +0100
tree e972c8caf730f1d4e149769819cfce4875dd9df9
parent e074d11450cd221a6005598e89bc0f0f1de63f40
parent 92eccf5a7378aa76b258d17234f64fcabb24ceb0

Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	utils/docker/Dockerfile

utils/docker/entrypoint.sh

diff --git a/utils/docker/entrypoint.sh b/utils/docker/entrypoint.sh
old mode 100755
new mode 100644
index 4349efd..c67e276
--- a/utils/docker/entrypoint.sh
+++ b/utils/docker/entrypoint.sh
@@ -9,4 +9,4 @@
 #echo 'Pulling the "google/cadvisor" image ... please wait'
 #docker pull 'google/cadvisor'
 
-exec /containernet/util/docker/entrypoint.sh $*
+exec /containernet/util/docker/entrypoint.sh $*
\ No newline at end of file