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

Dev but fix main merge conflicts #3039

Merged
merged 5 commits into from
Jan 29, 2025
Merged

Dev but fix main merge conflicts #3039

merged 5 commits into from
Jan 29, 2025

Conversation

tannalynn
Copy link
Contributor

No description provided.

kaylareopelle and others added 3 commits November 19, 2024 15:47
* add access key decode back for aws account id

* move nil check to arn create method

* update aws instrumentation to use updated access key method

* Remove Trivy scans

They are only required for teams that ship containers.
We do not ship containers.

* Sync changelog with docs editor updates

* Backport config doc edits from technical writers

* Map Trilogy -> MySQL (#2966)

* Map Trilogy to MySQL

Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>

---------

Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>

* Change agent status to debug not warn (#2975)

* Change agent unavailable to `debug`

* Change title to bugfix (#2979)

* Prerelease 9.16.1-pre (#2980)

* bump version

---------

Co-authored-by: newrelic-ruby-agent-bot <ruby-agent@newrelic.com>
Co-authored-by: Hannah Ramadan <76922290+hannahramadan@users.noreply.github.com>

---------

Co-authored-by: Tanna McClure <tmcclure@newrelic.com>
Co-authored-by: Kayla Reopelle <kreopelle@newrelic.com>
Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
Co-authored-by: Hannah Ramadan <76922290+hannahramadan@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: newrelic-ruby-agent-bot <ruby-agent@newrelic.com>
Copy link
Contributor

SimpleCov Report

Coverage Threshold
Line 93.59% 93%

@hannahramadan hannahramadan merged commit 7834cce into dev Jan 29, 2025
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants