Skip to content

Commit

Permalink
Prepare release 2.15-rc.0 (grafana#10206)
Browse files Browse the repository at this point in the history
* Update VERSION

* Update CHANGELOG

* Cleanup deprecated features in preparation for 2.15 release (grafana#10197)

* Remove ingester shutdown via GET

* Update CHANGELOG

* Update RELEASE.md

* Update golang.org/x/crypto version for CVE-2024-45337
  • Loading branch information
chencs authored and bjorns163 committed Dec 30, 2024
1 parent 9c81332 commit 48d21cc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## main / unreleased
## 2.15.0-rc.0

* [ENHANCEMENT] Distributor: OTLP receiver now converts also metric metadata. See also https://github.com/prometheus/prometheus/pull/15416. #10168
* [ENHANCEMENT] Distributor: discard float and histogram samples with duplicated timestamps from each timeseries in a request before the request is forwarded to ingesters. Discarded samples are tracked by the `cortex_discarded_samples_total` metrics with reason `sample_duplicate_timestamp`. #10145
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The following table contains past releases and tentative dates for upcoming rele
| 2.12.0 | 2024-03-11 | Yuri Nikolic |
| 2.13.0 | 2024-06-17 | Dimitar Dimitrov |
| 2.14.0 | 2024-10-07 | Vladimir Varankin |
| 2.15.0 | 2024-12-09 | _To be announced_ |
| 2.15.0 | 2024-12-12 | Casie Chen |
| 2.16.0 | 2025-03-10 | _To be announced_ |

## Release shepherd responsibilities
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.14.1
2.15.0-rc.0
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
go.uber.org/atomic v1.11.0
go.uber.org/goleak v1.3.0
golang.org/x/crypto v0.31.0
golang.org/x/net v0.32.0
golang.org/x/net v0.31.0
golang.org/x/sync v0.10.0
golang.org/x/time v0.8.0
google.golang.org/grpc v1.67.1
Expand Down Expand Up @@ -88,8 +88,8 @@ require (
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/trace v1.32.0
go.uber.org/multierr v1.11.0
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
golang.org/x/term v0.27.0
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
golang.org/x/term v0.26.0
google.golang.org/api v0.209.0
google.golang.org/protobuf v1.35.2
sigs.k8s.io/kustomize/kyaml v0.18.1
Expand Down Expand Up @@ -273,9 +273,9 @@ require (
go.uber.org/zap v1.21.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.28.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/tools v0.27.0 // indirect
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583
Expand Down

0 comments on commit 48d21cc

Please sign in to comment.