Skip to content

Commit dbb5e7e

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18727 from pgier/prometheus-2.1.0
Automatic merge from submit-queue (batch tested with PRs 19008, 18727, 19038). upgrade prometheus v2.0.0 -> v2.1.0
2 parents eda7e84 + 5de6273 commit dbb5e7e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

‎examples/prometheus/prometheus-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
value: openshift/oauth-proxy:v1.0.0
1515
- description: The location of the prometheus image
1616
name: IMAGE_PROMETHEUS
17-
value: openshift/prometheus:v2.0.0
17+
value: openshift/prometheus:v2.1.0
1818
- description: The location of the alertmanager image
1919
name: IMAGE_ALERTMANAGER
2020
value: openshift/prometheus-alertmanager:v0.14.0

‎examples/prometheus/prometheus.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
value: openshift/oauth-proxy:v1.0.0
1818
- description: The location of the prometheus image
1919
name: IMAGE_PROMETHEUS
20-
value: openshift/prometheus:v2.0.0
20+
value: openshift/prometheus:v2.1.0
2121
- description: The location of the alertmanager image
2222
name: IMAGE_ALERTMANAGER
2323
value: openshift/prometheus-alertmanager:v0.14.0

‎pkg/oc/bootstrap/bindata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/extended/testdata/bindata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)