Fixes https://pagure.io/koji/issue/4367
1 new commit added
include pending PRs
Currently on master branch we have:
$ git log --first-parent --oneline koji-1.35.2..master 91ec3d58e PR#4232: handle arch-duplicate logs in importImageInternal 4729cf868 PR#4358: Fix min_avail calculation caeac8e7c PR#4357: Fix two unit test issues 28a2da913 PR#4270: keep latest default repo for build tags 6113ef71c PR#4303: Fix tasks url creation 758973855 PR#4310: fix option data types and add unit test 3e48c8597 PR#4125: partial draft support for cg_import 33a76afab PR#4341: Fix python2 unittests 30cc20652 PR#4334: work around parse_qs behavior in python < 3.11 8e5509845 PR#4330: drop custom threadlocal implementation 00a01d252 PR#4328: use unittest.mock instead of mock 9e2e7023f PR#4326: Remove fp file using os.unlink instead of using the delete option of NamedTemporaryFile
Two of these are marked for 1.36 and not appropriate to pull into 1.35.3: #4330 and #4125. So, we will need to create a branch for this release. I have made a start on that here:
https://pagure.io/fork/mikem/koji/commits/koji-1.35-updates
This is current master minus those two, made by cherry picking with -m1). We also have three pending PRs for 1.35.3, including this one. I have already included the other two in the release notes. Once they are merged, I will apply them to the 1.35.3 branch.
-m1
Metadata Update from @mikem: - Pull-request tagged with: no_qe
PRs #4335 and #4363 have been merged and applied to my proposed branch
This branch differs from master only by the two 1.36 PRs we are omitting from the release (that is, if I apply them, the branches become identical).
rebased onto b21cb0bac55285641df0bbccdfcd6d6d1d93bdad
Commit f88eddb1 fixes this pull-request
Pull-Request has been merged by mikem
Fixes https://pagure.io/koji/issue/4367