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.

Sign up for GitHub

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

Jump to bottom

Update Makefile: Fix typo max_txs_bytes (backport #4250) #4251

Merged
merged 3 commits into from
Jan 20, 2025
Merged

Update Makefile: Fix typo max_txs_bytes (backport #4250) #4251

merged 3 commits into from
Jan 20, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 20, 2025

Overview

This is an automatic backport of pull request #4250 done by [Mergify](https://mergify.com).

@Enigma-Validator @mergify
Update Makefile: Fix typo max_txs_bytes (#4250)
6238b63 
<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

<!--
There was a typo on the sed command
sed -i "s/^max_txs_bytes = .*/max_tx_bytes = 7897088/" $(CONFIG_FILE);
Instead of
sed -i "s/^max_tx_bytes = .*/max_tx_bytes = 7897088/" $(CONFIG_FILE);
-->

(cherry picked from commit 8093218)

# Conflicts:
#	Makefile
@mergify mergify bot added the conflicts label Jan 20, 2025
@mergify mergify bot requested a review from a team as a code owner January 20, 2025 18:11
@mergify mergify bot requested review from rootulp and ninabarbakadze January 20, 2025 18:11
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jan 20, 2025

Cherry-pick of 8093218 has failed:

On branch mergify/bp/v3.x/pr-4250
Your branch is up to date with 'origin/v3.x'.

You are currently cherry-picking commit 8093218.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile

no changes added to commit (use "git add" and/or "git commit -a")

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

@github-actions github-actions bot added the bot item was created by a bot label Jan 20, 2025
@rootulp rootulp enabled auto-merge (squash) January 20, 2025 18:19
@rootulp rootulp merged commit dd05d69 into v3.x Jan 20, 2025
27 of 29 checks passed
@rootulp rootulp deleted the mergify/bp/v3.x/pr-4250 branch January 20, 2025 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rootulp rootulp rootulp approved these changes

@evan-forbes evan-forbes evan-forbes approved these changes

@ninabarbakadze ninabarbakadze Awaiting requested review from ninabarbakadze ninabarbakadze is a code owner automatically assigned from celestiaorg/celestia-core

Assignees
No one assigned
Labels
bot item was created by a bot conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rootulp @evan-forbes @Enigma-Validator