RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.7'

This commit is contained in:
beorn7 2017-09-28 16:46:33 +02:00
parent bea12d4be1 2e8092aec9
commit f1d4558469
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -3,7 +3,7 @@ sudo: false
language: go language: go
go: go:
- 1.8.x - 1.9.x
- 1.x - 1.x
go_import_path: github.com/prometheus/prometheus go_import_path: github.com/prometheus/prometheus

2
circle.yml
View File

@ -2,7 +2,7 @@ machine:
environment: environment:
DOCKER_IMAGE_NAME: prom/prometheus DOCKER_IMAGE_NAME: prom/prometheus
QUAY_IMAGE_NAME: quay.io/prometheus/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 REPO_PATH: github.com/prometheus/prometheus
pre: pre:
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci' - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'