tree f00ed60e326b9b9f24ea37f87e5cf43b9849d377
parent 643d29ec75dde4a8bdcecf877276540f79072d40
parent 16172bc45c70dc712a4b75b02fa575e7b5ad1485
author Luca Milanesio <luca.milanesio@gmail.com> 1583452811 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1583452811 +0000

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Use dockerized prometheus instance instead of the local one

Change-Id: I3f141c3426629c45958e99f931f3848a331ead94