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

chore: bump clap from 3.1.8 to 3.1.10 (backport #211) #218

Open
wants to merge 1 commit into
base: v1.9
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 20, 2022

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

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

You are currently cherry-picking commit e39c48ccd.
  (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:   accounts-cluster-bench/Cargo.toml
	modified:   bench-streamer/Cargo.toml
	modified:   clap-utils/Cargo.toml
	modified:   clap-v3-utils/Cargo.toml
	modified:   cli-output/Cargo.toml
	modified:   client/Cargo.toml
	modified:   genesis/Cargo.toml
	modified:   install/Cargo.toml
	modified:   log-analyzer/Cargo.toml
	modified:   tokens/Cargo.toml
	modified:   transaction-dos/Cargo.toml
	modified:   validator/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   accounts-bench/Cargo.toml
	both modified:   banking-bench/Cargo.toml
	both modified:   bench-tps/Cargo.toml
	both modified:   cli/Cargo.toml
	both modified:   dos/Cargo.toml
	both modified:   gossip/Cargo.toml
	both modified:   ledger-tool/Cargo.toml
	both modified:   merkle-root-bench/Cargo.toml
	both modified:   net-shaper/Cargo.toml
	both modified:   net-utils/Cargo.toml
	both modified:   poh-bench/Cargo.toml
	both modified:   rbpf-cli/Cargo.toml
	both modified:   runtime/store-tool/Cargo.toml
	both modified:   sdk/cargo-build-bpf/Cargo.toml
	both modified:   sdk/cargo-test-bpf/Cargo.toml
	both modified:   stake-accounts/Cargo.toml
	both modified:   sys-tuner/Cargo.toml
	both modified:   watchtower/Cargo.toml

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

Bumps [clap](https://github.com/clap-rs/clap) from 3.1.8 to 3.1.10.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](clap-rs/clap@v3.1.8...v3.1.10)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit e39c48c)

# Conflicts:
#	Cargo.lock
#	accounts-bench/Cargo.toml
#	banking-bench/Cargo.toml
#	bench-tps/Cargo.toml
#	cli/Cargo.toml
#	dos/Cargo.toml
#	gossip/Cargo.toml
#	ledger-tool/Cargo.toml
#	merkle-root-bench/Cargo.toml
#	net-shaper/Cargo.toml
#	net-utils/Cargo.toml
#	poh-bench/Cargo.toml
#	rbpf-cli/Cargo.toml
#	runtime/store-tool/Cargo.toml
#	sdk/cargo-build-bpf/Cargo.toml
#	sdk/cargo-test-bpf/Cargo.toml
#	stake-accounts/Cargo.toml
#	sys-tuner/Cargo.toml
#	watchtower/Cargo.toml
@mergify mergify bot added the conflicts label Apr 20, 2022
jstarry pushed a commit that referenced this pull request Mar 21, 2024
#### Problem
As we further optimize the HotStorageMeta in #146, there is a need
for a HotAccount struct that contains all the hot account information.
Meanwhile, we currently don't have plans to develop a cold account
format at this moment.  As a result, this makes it desirable to repurpose
TieredReadableAccount to HotAccount.

#### Summary of Changes
Repurpose TieredReadableAccount to HotAccount.

#### Test Plan
Existing tiered-storage tests.
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.

0 participants