From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Fri, 15 Apr 2016 14:32:35 +0000 (+0200)
Subject: Merge pull request #75 from stevenvanrossem/master
X-Git-Tag: v3.1~148
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1cbad5fddca5a204ac4c2c6a5ba1e9df949f1dd6;p=osm%2Fvim-emu.git

Merge pull request #75 from stevenvanrossem/master

start prometheus and cadvisor docker containers as monitoring tools
---

1cbad5fddca5a204ac4c2c6a5ba1e9df949f1dd6