Hi Thayne, On Thu, Jan 07, 2021 at 09:45:57PM -0700, Thayne McCombs wrote: > Here it is split up into multiple patches. > I also included a patch that adds a few words to the > ignore-words-list in the codespell workflow.
Thank you, merged. However I've reworded all commit messages to put all the information we need to have there (please have a look at CONTRIBUTING, it's a bit long but you'll get all the details). You'll probably understand that when we're working on maintenance branches, it's much less convenient to deal with such a changelog: commit 5fafd043b9c20a3fc7cc7dbc5941507e8236936f (HEAD -> master) Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:42:56 2021 -0700 Add a few more words to the codespell ignore list commit a4e38ed75172f65f91487a979f4d8369d7803f28 Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:36:27 2021 -0700 Fix typo in scripts/announce-release commit 122c9265e9b34ad0ae10c94605f1c1c9a3e3e7de Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:35:52 2021 -0700 Fix spelling errors in comments commit 89e7d89297e42e479a43e262cc49c8a8f587764a Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:24:41 2021 -0700 Spelling fixes in documentation commit 5a982a71656ce885be4b1d4b90b8db31204788a1 Author: William Dauchy <[email protected]> Date: Fri Jan 8 13:18:06 2021 +0100 MINOR: contrib/prometheus-exporter: export build_info commit c55a626217a7e676e1cc ("MINOR: contrib/prometheus-exporter: Add missing global and per-server metrics") is renaming two metrics between v2.2 and v2.3: server_idle_connections_current server_idle_connections_limit It is breaking some tools which are making use of those metrics while supporting several haproxy versions. This build_info will permit tools which make use of metrics to be able to match the haproxy version and change the list of expected metrics. This was possible using the haproxy stats socket but not with prometheus export. (...) Than with this one: commit ffa21224c04ffaf6ed2544dec9170353fac9fb21 (HEAD -> master, flx04/master) Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:42:56 2021 -0700 CI: github: add a few more words to the codespell ignore list This adds "referer,ot,uint,iif,fo,keep-alives" to the ignore list: - "referer" is the well-known HTTP header field name (with its spelling error) - "ot" appears a lot in the opentracing contrib. - "iff" often stands for "if and only if" - "fo" appears as a test string in tests/ist.c (could possibly be changed) - "keep-alives" appears as a noon in "...enable TCP keep-alives". commit 478e5ddc8d2ecab13391c96a4001081b1cf9b981 Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:36:27 2021 -0700 SCRIPTS: announce-release: fix typo in help message s/relase/release in -p help message. commit 8f0cc5c4bafc767ca607876ec27c58097197ac15 Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:35:52 2021 -0700 CLEANUP: Fix spelling errors in comments This is from the output of codespell. It's done at once over a bunch of files and only affects comments, so there is nothing user-visible. No backport needed. commit cdbcca9995a4974c6998720e158d6f1d4d9a25c0 Author: Thayne McCombs <[email protected]> Date: Thu Jan 7 21:24:41 2021 -0700 DOC: fix some spelling issues over multiple files This is from the output of codespell and may be backported. commit 5a982a71656ce885be4b1d4b90b8db31204788a1 (...) You'll also note the difference in verbosity and instructions between these ones and the last one on prometheus-exporter, which much better matches our expectations. I'm not saying this in a negative way and rest assured that I'm happy with your patches (hence why they were merged), I'm just saying this so that next time you figure how to make your patches more fluid to handle. Just to give you an idea, it took me 11 minutes to review them all and figure what to write there, which is still less than what it would have costed when being backported to each and every version, but likely more than what it would have taken you when creating them and dumping what you had in mind. It's not always intuitive at the beginning but with a bit of practice you'll see that it comes easily. Thanks! Willy
