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

Support for Darwin and Silicon Valley chips #1957

Closed
wants to merge 33 commits into from
Closed

Support for Darwin and Silicon Valley chips #1957

wants to merge 33 commits into from

Conversation

ricardoborenstein
Copy link
Contributor

amnonh and others added 30 commits February 22, 2023 12:05
…t to scylladb section

(cherry picked from commit 6fee4b1)
(cherry picked from commit 89ed760)
(cherry picked from commit 2fc3866)
The following rules where added:
scylla_storage_proxy_coordinator_background_writes_ag
scylla_hints_manager_written_ag
scylla_hints_manager_sent_ag

(cherry picked from commit 5cb9bb5)
(cherry picked from commit 2bc6a61)
(cherry picked from commit 8b49549)
(cherry picked from commit 24eaff0)
@amnonh
Copy link
Collaborator

amnonh commented Apr 25, 2023

@ricardoborenstein, congrats on your first PR.

As you can see, it contains conflicts.

The problem is that you started from the 4.3 branch instead of the master branch.

To create a PR properly, start from the master branch.
Also, just so you know, some files you added are generated and shouldn't be part of the repository.

@amnonh
Copy link
Collaborator

amnonh commented May 3, 2023

@ricardoborenstein ping, please updat this PR so I can merge it before we branch 4.4

@ricardoborenstein ricardoborenstein closed this by deleting the head repository May 17, 2023
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.

None yet

2 participants