Merge branch 'release-1.2'

2016-10-10 17:59:58 +02:00 · 2016-10-10 17:59:58 +02:00 · 492eac96d5
parent b66ce9c5cd dd66f2e94b
commit 492eac96d5
1 changed files with 2 additions and 1 deletions
--- a/.promu.yml
+++ b/.promu.yml
@ -1,4 +1,5 @@
-go: 1.7.1
+go:
+    version: 1.7.1
 repository:
    path: github.com/prometheus/prometheus
 build: