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.

Sign up for GitHub

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

Final versions + prelude #11585

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Final versions + prelude #11585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ require (
code.cloudfoundry.org/garden v0.0.0-20210208153517-580cadd489d2
code.cloudfoundry.org/lager v2.0.0+incompatible
github.com/DataDog/agent-payload/v5 v5.0.16
github.com/DataDog/datadog-agent/pkg/obfuscate v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/otlp/model v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/quantile v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/security/secl v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/util/log v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/util/winutil v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/obfuscate v0.35.0
github.com/DataDog/datadog-agent/pkg/otlp/model v0.35.0
github.com/DataDog/datadog-agent/pkg/quantile v0.35.0
github.com/DataDog/datadog-agent/pkg/security/secl v0.35.0
github.com/DataDog/datadog-agent/pkg/util/log v0.35.0
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0
github.com/DataDog/datadog-agent/pkg/util/winutil v0.35.0
github.com/DataDog/datadog-go v4.8.3+incompatible
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
View file
Open in desktop
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.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/quantile v0.35.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector/model v0.44.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/log/go.mod
View file
Open in desktop
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/util/scrubber => ../scrubber

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
github.com/stretchr/testify v1.7.0
go.uber.org/zap v1.20.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/winutil/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,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.35.0-rc.9
github.com/DataDog/datadog-agent/pkg/util/log v0.35.0
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210510120138-977fb7262007
)

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0-rc.9 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0 // 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
16 changes: 8 additions & 8 deletions release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@
"SECURITY_AGENT_POLICIES_VERSION": "master"
},
"release-a6": {
"INTEGRATIONS_CORE_VERSION": "7.35.0-rc.6",
"OMNIBUS_SOFTWARE_VERSION": "7.35.0-rc.6",
"OMNIBUS_RUBY_VERSION": "7.35.0-rc.2",
"INTEGRATIONS_CORE_VERSION": "7.35.0",
"OMNIBUS_SOFTWARE_VERSION": "7.35.0",
"OMNIBUS_RUBY_VERSION": "7.35.0",
"JMXFETCH_VERSION": "0.46.0",
"JMXFETCH_HASH": "3c41c0660e9c53451dfb51e8dad33bc87b03be1abc1fcd3c856ea81e6b0894ee",
"SECURITY_AGENT_POLICIES_VERSION": "v0.23.0",
"MACOS_BUILD_VERSION": "6.35.0-rc.1",
"MACOS_BUILD_VERSION": "6.35.0",
"WINDOWS_DDNPM_DRIVER": "release-signed",
"WINDOWS_DDNPM_VERSION": "1.3.2",
"WINDOWS_DDNPM_SHASUM": "1f65d40519bc307d652c64183b2cac2a36da9839c21d64f9823aa158ff6336bb"
},
"release-a7": {
"INTEGRATIONS_CORE_VERSION": "7.35.0-rc.6",
"OMNIBUS_SOFTWARE_VERSION": "7.35.0-rc.6",
"OMNIBUS_RUBY_VERSION": "7.35.0-rc.2",
"INTEGRATIONS_CORE_VERSION": "7.35.0",
"OMNIBUS_SOFTWARE_VERSION": "7.35.0",
"OMNIBUS_RUBY_VERSION": "7.35.0",
"JMXFETCH_VERSION": "0.46.0",
"JMXFETCH_HASH": "3c41c0660e9c53451dfb51e8dad33bc87b03be1abc1fcd3c856ea81e6b0894ee",
"SECURITY_AGENT_POLICIES_VERSION": "v0.23.0",
"MACOS_BUILD_VERSION": "7.35.0-rc.1",
"MACOS_BUILD_VERSION": "7.35.0",
"WINDOWS_DDNPM_DRIVER": "release-signed",
"WINDOWS_DDNPM_VERSION": "1.3.2",
"WINDOWS_DDNPM_SHASUM": "1f65d40519bc307d652c64183b2cac2a36da9839c21d64f9823aa158ff6336bb"
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/prelude-release-7.35.0-2a2e5520271803fa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
prelude:
|
Release on: 2022-04-06
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note: might need to be updated when the release actually happens)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is usually updated with the changelog PR. I am honestly not sure why we do it this way, there is a room for improvement here.


- Please refer to the `7.35.0 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7350>`_ for the list of changes on the Core Checks