Merge branch 'release-1.2'

This commit is contained in:
beorn7 2016-10-10 17:59:58 +02:00
commit 492eac96d5

View file

@ -1,4 +1,5 @@
go: 1.7.1
go:
version: 1.7.1
repository:
path: github.com/prometheus/prometheus
build: