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

Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own repo (backport #22567) #22582

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 19, 2022

This is an automatic backport of pull request #22567 done by Mergify.
Cherry-pick of 60850d7 has failed:

On branch mergify/bp/v1.9/pr-22567
Your branch is up to date with 'origin/v1.9'.

You are currently cherry-picking commit 60850d71c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.toml
	deleted:    accountsdb-plugin-postgres/README.md
	deleted:    accountsdb-plugin-postgres/scripts/create_schema.sql
	deleted:    accountsdb-plugin-postgres/scripts/drop_schema.sql
	deleted:    accountsdb-plugin-postgres/scripts/postgresql.conf
	deleted:    accountsdb-plugin-postgres/src/accounts_selector.rs
	deleted:    accountsdb-plugin-postgres/src/accountsdb_plugin_postgres.rs
	deleted:    accountsdb-plugin-postgres/src/lib.rs
	deleted:    accountsdb-plugin-postgres/src/postgres_client/postgres_client_block_metadata.rs
	deleted:    accountsdb-plugin-postgres/src/transaction_selector.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	deleted by them: accountsdb-plugin-postgres/Cargo.toml
	deleted by them: accountsdb-plugin-postgres/src/postgres_client.rs
	deleted by them: accountsdb-plugin-postgres/src/postgres_client/postgres_client_transaction.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

… its own (#22567)

Removed solana-accountsdb-plugin-postgres from the monorepo as it has its own  standalone repo now

(cherry picked from commit 60850d7)

# Conflicts:
#	Cargo.lock
#	accountsdb-plugin-postgres/Cargo.toml
#	accountsdb-plugin-postgres/src/postgres_client.rs
#	accountsdb-plugin-postgres/src/postgres_client/postgres_client_transaction.rs
@mergify mergify bot added the conflicts label Jan 19, 2022
@mvines mvines closed this Feb 16, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22567 branch February 16, 2022 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants