Skip to content

Commit

Permalink
[mq] working branch - merge e81f407 on top of main at a4ab67f
Browse files Browse the repository at this point in the history
{"baseBranch":"main","baseCommit":"a4ab67f6572f36e8a77dc679e662d6f7c097f0ff","createdAt":"2024-12-13T13:58:29.987973Z","headSha":"e81f40719aef92a51ff9bb622e2cbd1df3d7269b","id":"85d28afe-4f10-4bf6-843a-2997d1453a1f","priority":"200","pullRequestNumber":"1299","queuedAt":"2024-12-16T10:01:46.521095Z","status":"STATUS_QUEUED"}
  • Loading branch information
dd-mergequeue[bot] authored Dec 16, 2024
2 parents be81185 + e81f407 commit 4ecd28b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions components/datadog/apps/dogstatsd/images/dogstatsd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ module dogstatsd

go 1.22

require github.com/DataDog/datadog-go/v5 v5.5.0
require github.com/DataDog/datadog-go/v5 v5.6.0

require (
github.com/Microsoft/go-winio v0.5.0 // indirect
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
)

// Temporary replacement of the main branch until https://github.com/DataDog/datadog-go/pull/304 is released
replace github.com/DataDog/datadog-go/v5 => github.com/DataDog/datadog-go/v5 v5.5.1-0.20240327105053-fa1f6814eaf7
4 changes: 2 additions & 2 deletions components/datadog/apps/dogstatsd/images/dogstatsd/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/DataDog/datadog-go/v5 v5.5.1-0.20240327105053-fa1f6814eaf7 h1:pOfzUVqO/rT7VTY9L7qK5oeiuBBIiuZgt0Nf7J3ywDQ=
github.com/DataDog/datadog-go/v5 v5.5.1-0.20240327105053-fa1f6814eaf7/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down

0 comments on commit 4ecd28b

Please sign in to comment.