Skip to content

Fixes for OpenAPI (RPC) documents and QA docs restructuring (backport #472)#561

Merged
andynog merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-472
Mar 21, 2023
Merged

Fixes for OpenAPI (RPC) documents and QA docs restructuring (backport #472)#561
andynog merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-472

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2023

This is an automatic backport of pull request #472 done by Mergify.
Cherry-pick of 3cd1037 has failed:

On branch mergify/bp/v0.34.x/pr-472
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 3cd103780.
  (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:
	renamed:    docs/qa/v034/README.md -> docs/qa/CometBFT-QA-34.md
	renamed:    docs/qa/v034/TMCore.md -> docs/qa/TMCore-QA-34.md
	renamed:    docs/qa/v034/img/baseline/avg_cpu.png -> docs/qa/img34/baseline/avg_cpu.png
	renamed:    docs/qa/v034/img/baseline/avg_memory.png -> docs/qa/img34/baseline/avg_memory.png
	renamed:    docs/qa/v034/img/baseline/avg_mempool_size.png -> docs/qa/img34/baseline/avg_mempool_size.png
	renamed:    docs/qa/v034/img/baseline/block_rate_regular.png -> docs/qa/img34/baseline/block_rate_regular.png
	renamed:    docs/qa/v034/img/baseline/cpu.png -> docs/qa/img34/baseline/cpu.png
	renamed:    docs/qa/v034/img/baseline/memory.png -> docs/qa/img34/baseline/memory.png
	renamed:    docs/qa/v034/img/baseline/mempool_size.png -> docs/qa/img34/baseline/mempool_size.png
	renamed:    docs/qa/v034/img/baseline/peers.png -> docs/qa/img34/baseline/peers.png
	renamed:    docs/qa/v034/img/baseline/rounds.png -> docs/qa/img34/baseline/rounds.png
	renamed:    docs/qa/v034/img/baseline/total_txs_rate_regular.png -> docs/qa/img34/baseline/total_txs_rate_regular.png
	renamed:    docs/qa/v034/img/cmt1tm1/all_experiments.png -> docs/qa/img34/cmt1tm1/all_experiments.png
	renamed:    docs/qa/v034/img/cmt1tm1/avg_cpu.png -> docs/qa/img34/cmt1tm1/avg_cpu.png
	renamed:    docs/qa/v034/img/cmt1tm1/avg_memory.png -> docs/qa/img34/cmt1tm1/avg_memory.png
	renamed:    docs/qa/v034/img/cmt1tm1/avg_mempool_size.png -> docs/qa/img34/cmt1tm1/avg_mempool_size.png
	renamed:    docs/qa/v034/img/cmt1tm1/block_rate_regular.png -> docs/qa/img34/cmt1tm1/block_rate_regular.png
	renamed:    docs/qa/v034/img/cmt1tm1/cpu.png -> docs/qa/img34/cmt1tm1/cpu.png
	renamed:    docs/qa/v034/img/cmt1tm1/memory.png -> docs/qa/img34/cmt1tm1/memory.png
	renamed:    docs/qa/v034/img/cmt1tm1/mempool_size.png -> docs/qa/img34/cmt1tm1/mempool_size.png
	renamed:    docs/qa/v034/img/cmt1tm1/peers.png -> docs/qa/img34/cmt1tm1/peers.png
	renamed:    docs/qa/v034/img/cmt1tm1/rounds.png -> docs/qa/img34/cmt1tm1/rounds.png
	renamed:    docs/qa/v034/img/cmt1tm1/total_txs_rate_regular.png -> docs/qa/img34/cmt1tm1/total_txs_rate_regular.png
	renamed:    docs/qa/v034/img/cmt2tm1/all_experiments.png -> docs/qa/img34/cmt2tm1/all_experiments.png
	renamed:    docs/qa/v034/img/cmt2tm1/avg_cpu.png -> docs/qa/img34/cmt2tm1/avg_cpu.png
	renamed:    docs/qa/v034/img/cmt2tm1/avg_memory.png -> docs/qa/img34/cmt2tm1/avg_memory.png
	renamed:    docs/qa/v034/img/cmt2tm1/avg_mempool_size.png -> docs/qa/img34/cmt2tm1/avg_mempool_size.png
	renamed:    docs/qa/v034/img/cmt2tm1/block_rate_regular.png -> docs/qa/img34/cmt2tm1/block_rate_regular.png
	renamed:    docs/qa/v034/img/cmt2tm1/cpu.png -> docs/qa/img34/cmt2tm1/cpu.png
	renamed:    docs/qa/v034/img/cmt2tm1/memory.png -> docs/qa/img34/cmt2tm1/memory.png
	renamed:    docs/qa/v034/img/cmt2tm1/mempool_size.png -> docs/qa/img34/cmt2tm1/mempool_size.png
	renamed:    docs/qa/v034/img/cmt2tm1/peers.png -> docs/qa/img34/cmt2tm1/peers.png
	renamed:    docs/qa/v034/img/cmt2tm1/rounds.png -> docs/qa/img34/cmt2tm1/rounds.png
	renamed:    docs/qa/v034/img/cmt2tm1/total_txs_rate_regular.png -> docs/qa/img34/cmt2tm1/total_txs_rate_regular.png
	renamed:    docs/qa/v034/img/homogeneous/all_experiments.png -> docs/qa/img34/homogeneous/all_experiments.png
	renamed:    docs/qa/v034/img/homogeneous/avg_cpu.png -> docs/qa/img34/homogeneous/avg_cpu.png
	renamed:    docs/qa/v034/img/homogeneous/avg_memory.png -> docs/qa/img34/homogeneous/avg_memory.png
	renamed:    docs/qa/v034/img/homogeneous/avg_mempool_size.png -> docs/qa/img34/homogeneous/avg_mempool_size.png
	renamed:    docs/qa/v034/img/homogeneous/block_rate_regular.png -> docs/qa/img34/homogeneous/block_rate_regular.png
	renamed:    docs/qa/v034/img/homogeneous/cpu.png -> docs/qa/img34/homogeneous/cpu.png
	renamed:    docs/qa/v034/img/homogeneous/memory.png -> docs/qa/img34/homogeneous/memory.png
	renamed:    docs/qa/v034/img/homogeneous/mempool_size.png -> docs/qa/img34/homogeneous/mempool_size.png
	renamed:    docs/qa/v034/img/homogeneous/peers.png -> docs/qa/img34/homogeneous/peers.png
	renamed:    docs/qa/v034/img/homogeneous/rounds.png -> docs/qa/img34/homogeneous/rounds.png
	renamed:    docs/qa/v034/img/homogeneous/total_txs_rate_regular.png -> docs/qa/img34/homogeneous/total_txs_rate_regular.png
	renamed:    docs/qa/v034/img/v034_200node_latencies.png -> docs/qa/img34/v034_200node_latencies.png
	renamed:    docs/qa/v034/img/v034_200node_latencies_zoomed.png -> docs/qa/img34/v034_200node_latencies_zoomed.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/all_experiments.png -> docs/qa/img34/v034_200node_tm2cmt1/all_experiments.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/avg_cpu.png -> docs/qa/img34/v034_200node_tm2cmt1/avg_cpu.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/avg_memory.png -> docs/qa/img34/v034_200node_tm2cmt1/avg_memory.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/avg_mempool_size.png -> docs/qa/img34/v034_200node_tm2cmt1/avg_mempool_size.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/block_rate_regular.png -> docs/qa/img34/v034_200node_tm2cmt1/block_rate_regular.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/c2r200_merged.png -> docs/qa/img34/v034_200node_tm2cmt1/c2r200_merged.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/cpu.png -> docs/qa/img34/v034_200node_tm2cmt1/cpu.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/memory.png -> docs/qa/img34/v034_200node_tm2cmt1/memory.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/mempool_size.png -> docs/qa/img34/v034_200node_tm2cmt1/mempool_size.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/peers.png -> docs/qa/img34/v034_200node_tm2cmt1/peers.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/rounds.png -> docs/qa/img34/v034_200node_tm2cmt1/rounds.png
	renamed:    docs/qa/v034/img/v034_200node_tm2cmt1/total_txs_rate_regular.png -> docs/qa/img34/v034_200node_tm2cmt1/total_txs_rate_regular.png
	renamed:    docs/qa/v034/img/v034_latency_throughput.png -> docs/qa/img34/v034_latency_throughput.png
	renamed:    docs/qa/v034/img/v034_r200c2_heights.png -> docs/qa/img34/v034_r200c2_heights.png
	renamed:    docs/qa/v034/img/v034_r200c2_load-runner.png -> docs/qa/img34/v034_r200c2_load-runner.png
	renamed:    docs/qa/v034/img/v034_r200c2_load1.png -> docs/qa/img34/v034_r200c2_load1.png
	renamed:    docs/qa/v034/img/v034_r200c2_mempool_size.png -> docs/qa/img34/v034_r200c2_mempool_size.png
	renamed:    docs/qa/v034/img/v034_r200c2_mempool_size_avg.png -> docs/qa/img34/v034_r200c2_mempool_size_avg.png
	renamed:    docs/qa/v034/img/v034_r200c2_peers.png -> docs/qa/img34/v034_r200c2_peers.png
	renamed:    docs/qa/v034/img/v034_r200c2_rounds.png -> docs/qa/img34/v034_r200c2_rounds.png
	renamed:    docs/qa/v034/img/v034_r200c2_rss.png -> docs/qa/img34/v034_r200c2_rss.png
	renamed:    docs/qa/v034/img/v034_r200c2_rss_avg.png -> docs/qa/img34/v034_r200c2_rss_avg.png
	renamed:    docs/qa/v034/img/v034_r200c2_total-txs.png -> docs/qa/img34/v034_r200c2_total-txs.png
	renamed:    docs/qa/v034/img/v034_report_tabbed.txt -> docs/qa/img34/v034_report_tabbed.txt
	renamed:    docs/qa/v034/img/v034_rotating_heights.png -> docs/qa/img34/v034_rotating_heights.png
	renamed:    docs/qa/v034/img/v034_rotating_heights_ephe.png -> docs/qa/img34/v034_rotating_heights_ephe.png
	renamed:    docs/qa/v034/img/v034_rotating_latencies.png -> docs/qa/img34/v034_rotating_latencies.png
	renamed:    docs/qa/v034/img/v034_rotating_latencies_uniq.png -> docs/qa/img34/v034_rotating_latencies_uniq.png
	renamed:    docs/qa/v034/img/v034_rotating_load1.png -> docs/qa/img34/v034_rotating_load1.png
	renamed:    docs/qa/v034/img/v034_rotating_peers.png -> docs/qa/img34/v034_rotating_peers.png
	renamed:    docs/qa/v034/img/v034_rotating_rss_avg.png -> docs/qa/img34/v034_rotating_rss_avg.png
	renamed:    docs/qa/v034/img/v034_rotating_total-txs.png -> docs/qa/img34/v034_rotating_total-txs.png
	modified:   docs/qa/method.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/qa/CometBFT-QA-37.md
	both modified:   docs/qa/README.md
	deleted by us:   docs/qa/TMCore-QA-37.md
	deleted by us:   docs/qa/img37/200nodes_cmt037/all_experiments.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/avg_mempool_size.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/block_rate.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/cpu.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/e_75cb89a8-f876-4698-82f3-8aaab0b361af.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/memory.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/mempool_size.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/peers.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/rounds.png
	deleted by us:   docs/qa/img37/200nodes_cmt037/total_txs_rate.png
	deleted by us:   docs/qa/img37/200nodes_tm037/avg_mempool_size.png
	deleted by us:   docs/qa/img37/200nodes_tm037/block_rate_regular.png
	deleted by us:   docs/qa/img37/200nodes_tm037/cpu.png
	deleted by us:   docs/qa/img37/200nodes_tm037/memory.png
	deleted by us:   docs/qa/img37/200nodes_tm037/mempool_size.png
	deleted by us:   docs/qa/img37/200nodes_tm037/peers.png
	deleted by us:   docs/qa/img37/200nodes_tm037/rounds.png
	deleted by us:   docs/qa/img37/200nodes_tm037/total_txs_rate_regular.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_200node_latencies.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_latency_throughput.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_heights.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_load1.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_mempool_size.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_mempool_size_avg.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_peers.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_rounds.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_rss.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_rss_avg.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_r200c2_total-txs.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_report_tabbed.txt
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_heights.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_heights_ephe.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_latencies.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_load1.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_peers.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_rss_avg.png
	deleted by us:   docs/qa/img37/200nodes_tm037/v037_rotating_total-txs.png
	both modified:   rpc/openapi/openapi.yaml

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

* openapi doc fixes and QA docs fixes

* rename title

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* fix text

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* add backquotes

Co-authored-by: Thane Thomson <connect@thanethomson.com>

* update contact

---------

Co-authored-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 3cd1037)

# Conflicts:
#	docs/qa/CometBFT-QA-37.md
#	docs/qa/README.md
#	docs/qa/TMCore-QA-37.md
#	docs/qa/img37/200nodes_cmt037/all_experiments.png
#	docs/qa/img37/200nodes_cmt037/avg_mempool_size.png
#	docs/qa/img37/200nodes_cmt037/block_rate.png
#	docs/qa/img37/200nodes_cmt037/cpu.png
#	docs/qa/img37/200nodes_cmt037/e_75cb89a8-f876-4698-82f3-8aaab0b361af.png
#	docs/qa/img37/200nodes_cmt037/memory.png
#	docs/qa/img37/200nodes_cmt037/mempool_size.png
#	docs/qa/img37/200nodes_cmt037/peers.png
#	docs/qa/img37/200nodes_cmt037/rounds.png
#	docs/qa/img37/200nodes_cmt037/total_txs_rate.png
#	docs/qa/img37/200nodes_tm037/avg_mempool_size.png
#	docs/qa/img37/200nodes_tm037/block_rate_regular.png
#	docs/qa/img37/200nodes_tm037/cpu.png
#	docs/qa/img37/200nodes_tm037/memory.png
#	docs/qa/img37/200nodes_tm037/mempool_size.png
#	docs/qa/img37/200nodes_tm037/peers.png
#	docs/qa/img37/200nodes_tm037/rounds.png
#	docs/qa/img37/200nodes_tm037/total_txs_rate_regular.png
#	docs/qa/img37/200nodes_tm037/v037_200node_latencies.png
#	docs/qa/img37/200nodes_tm037/v037_latency_throughput.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_heights.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_load1.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_mempool_size.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_mempool_size_avg.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_peers.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_rounds.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_rss.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_rss_avg.png
#	docs/qa/img37/200nodes_tm037/v037_r200c2_total-txs.png
#	docs/qa/img37/200nodes_tm037/v037_report_tabbed.txt
#	docs/qa/img37/200nodes_tm037/v037_rotating_heights.png
#	docs/qa/img37/200nodes_tm037/v037_rotating_heights_ephe.png
#	docs/qa/img37/200nodes_tm037/v037_rotating_latencies.png
#	docs/qa/img37/200nodes_tm037/v037_rotating_load1.png
#	docs/qa/img37/200nodes_tm037/v037_rotating_peers.png
#	docs/qa/img37/200nodes_tm037/v037_rotating_rss_avg.png
#	docs/qa/img37/200nodes_tm037/v037_rotating_total-txs.png
#	rpc/openapi/openapi.yaml
@mergify mergify bot requested a review from a team as a code owner March 20, 2023 21:33
@mergify mergify bot added the conflicts label Mar 20, 2023
@andynog andynog self-assigned this Mar 20, 2023
@sergio-mena
Copy link
Collaborator

Please, do not commit v0.37.x reports on v0.34.x branch

@andynog
Copy link
Collaborator

andynog commented Mar 21, 2023

Please, do not commit v0.37.x reports on v0.34.x branch

Yes, I'll remove all v0.37.x related content. Thanks.

@andynog andynog added this to the 2023-Q1 milestone Mar 21, 2023
Copy link
Collaborator

@andynog andynog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging conflicts for v0.34 lgtm

@andynog andynog merged commit f2591e2 into v0.34.x Mar 21, 2023
@andynog andynog deleted the mergify/bp/v0.34.x/pr-472 branch March 21, 2023 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants