Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Remove budget program (backport #17816) #17822

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2021

This is an automatic backport of pull request #17816 done by Mergify.
Cherry-pick of a66566e has failed:

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

You are currently cherry-picking commit a66566e75.
  (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
	modified:   genesis/src/main.rs
	modified:   ledger/src/entry.rs
	modified:   perf/src/test_tx.rs
	deleted:    programs/budget/src/budget_expr.rs
	deleted:    programs/budget/src/budget_instruction.rs
	deleted:    programs/budget/src/budget_processor.rs
	deleted:    programs/budget/src/budget_state.rs
	deleted:    programs/budget/src/lib.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	both modified:   genesis/Cargo.toml
	both modified:   ledger/Cargo.toml
	both modified:   perf/Cargo.toml
	deleted by them: programs/budget/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

(cherry picked from commit a66566e)

# Conflicts:
#	Cargo.lock
#	genesis/Cargo.toml
#	ledger/Cargo.toml
#	perf/Cargo.toml
#	programs/budget/Cargo.toml
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 8, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 8, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 8, 2021
@mergify mergify bot merged commit fb767f4 into v1.7 Jun 8, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17816 branch June 8, 2021 03:07
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant