Merge branch 'release-1.7'

2017-09-28 16:46:33 +02:00 · 2017-09-28 16:46:33 +02:00 · f1d4558469
parent bea12d4be1 2e8092aec9
commit f1d4558469
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,7 +3,7 @@ sudo: false
 language: go

 go:
- 1.8.x
+- 1.9.x
 - 1.x

 go_import_path: github.com/prometheus/prometheus
--- a/circle.yml
+++ b/circle.yml
@ -2,7 +2,7 @@ machine:
  environment:
    DOCKER_IMAGE_NAME: prom/prometheus
    QUAY_IMAGE_NAME: quay.io/prometheus/prometheus
-    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.8-base
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.9-base
    REPO_PATH: github.com/prometheus/prometheus
  pre:
    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'