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/2.18.0 -> develop #15103

Merged
merged 11 commits into from
Nov 8, 2024
Merged

release/2.18.0 -> develop #15103

merged 11 commits into from
Nov 8, 2024

Conversation

chainchad
Copy link
Collaborator

Fixes merge conflicts by merging develop into this HEAD branch which was branched from release/2.18.0.

Digestible diff

chainchad and others added 10 commits October 22, 2024 14:49
…r from TypeAndVersion (#14861)

* core/services/ocr2/plugins/ccip/internal/ccipdata/factory: check error from TypeAndVersion

* .github: CCIP CODEOWNERS

(cherry picked from commit cc9bafa)
…18.0

core/services/ocr2/plugins/ccip/internal/ccipdata/factory: check error from TypeAndVersion [2.18.0]
…ent-confirmer-false-warning-2.18-cerry-pick

Hotfix/BCFR 1065 prevent confirmer false warning 2.18
* Update DA oracle config struct members to pointers

* Update tests and remake config docs

* suggestions and fix docs_test

* fix config test

(cherry picked from commit b585654)
…bugfix-da-struct

Update DA oracle config struct members to pointers (#15008)
@chainchad chainchad requested review from a team as code owners November 4, 2024 19:36
@chainchad chainchad requested a review from chudilka1 November 4, 2024 19:36
@Bwest981 Bwest981 enabled auto-merge November 4, 2024 22:16
@Bwest981 Bwest981 self-requested a review November 4, 2024 22:17
@Bwest981 Bwest981 added this pull request to the merge queue Nov 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 5, 2024
@chainchad chainchad added this pull request to the merge queue Nov 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 5, 2024
@chainchad chainchad added this pull request to the merge queue Nov 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 6, 2024
@chainchad chainchad added this pull request to the merge queue Nov 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 7, 2024
@chainchad chainchad added this pull request to the merge queue Nov 8, 2024
Merged via the queue into develop with commit f4565c5 Nov 8, 2024
137 of 138 checks passed
@chainchad chainchad deleted the chore/release/2.18.0-to-develop branch November 8, 2024 13:29
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.

6 participants