Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release] Update release.json and Go modules for 6/7.36.0-rc.2 #11628

Merged
merged 1 commit into from
Apr 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ require (
code.cloudfoundry.org/lager v2.0.0+incompatible
github.com/DataDog/agent-payload/v5 v5.0.19
github.com/DataDog/btf-internals v0.0.0-20220401093927-f65bd0b466d5
github.com/DataDog/datadog-agent/pkg/obfuscate v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/otlp/model v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/quantile v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/client v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/security/secl v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/trace v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/winutil v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/obfuscate v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/otlp/model v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/quantile v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/remoteconfig/client v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/security/secl v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/trace v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/log v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/util/winutil v0.36.0-rc.2
github.com/DataDog/datadog-go/v5 v5.1.0
github.com/DataDog/datadog-operator v0.5.0-rc.2.0.20210402083916-25ba9a22e67a
github.com/DataDog/ebpf v0.0.0-20220301203322-3fc9ab3b8daf
Expand Down
2 changes: 1 addition & 1 deletion pkg/otlp/model/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
replace github.com/DataDog/datadog-agent/pkg/quantile => ../../quantile

require (
github.com/DataDog/datadog-agent/pkg/quantile v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/quantile v0.36.0-rc.2
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector/model v0.47.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/trace/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/DataDog/datadog-agent/pkg/trace
go 1.17

require (
github.com/DataDog/datadog-agent/pkg/obfuscate v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/client v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/obfuscate v0.36.0-rc.2
github.com/DataDog/datadog-agent/pkg/remoteconfig/client v0.36.0-rc.2
github.com/DataDog/datadog-go/v5 v5.1.0
github.com/DataDog/sketches-go v1.2.1
github.com/Microsoft/go-winio v0.5.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/log/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go 1.17
replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.36.0-rc.2
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
github.com/stretchr/testify v1.7.1
go.uber.org/zap v1.20.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/winutil/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ replace github.com/DataDog/datadog-agent/pkg/util/log => ../log
replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber

require (
github.com/DataDog/datadog-agent/pkg/util/log v0.36.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.36.0-rc.2
github.com/stretchr/testify v1.7.1
golang.org/x/sys v0.0.0-20210510120138-977fb7262007
)

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.36.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.36.0-rc.2 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions release.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"SECURITY_AGENT_POLICIES_VERSION": "master"
},
"release-a6": {
"INTEGRATIONS_CORE_VERSION": "7.36.0-rc.1",
"INTEGRATIONS_CORE_VERSION": "7.36.0-rc.2",
"OMNIBUS_SOFTWARE_VERSION": "7.36.0-rc.1",
"OMNIBUS_RUBY_VERSION": "7.36.0-rc.1",
"JMXFETCH_VERSION": "0.46.0",
Expand All @@ -41,7 +41,7 @@
"WINDOWS_DDNPM_SHASUM": "1f65d40519bc307d652c64183b2cac2a36da9839c21d64f9823aa158ff6336bb"
},
"release-a7": {
"INTEGRATIONS_CORE_VERSION": "7.36.0-rc.1",
"INTEGRATIONS_CORE_VERSION": "7.36.0-rc.2",
"OMNIBUS_SOFTWARE_VERSION": "7.36.0-rc.1",
"OMNIBUS_RUBY_VERSION": "7.36.0-rc.1",
"JMXFETCH_VERSION": "0.46.0",
Expand Down