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

Merge 23.7.x branch back into main #13094

Merged
merged 8 commits into from
Sep 12, 2023
Merged

Merge 23.7.x branch back into main #13094

merged 8 commits into from
Sep 12, 2023

Conversation

beeankha
Copy link
Contributor

@beeankha beeankha commented Sep 12, 2023

Merges 23.7.4 hotfixes (#13076, #13035, #13071) back into main.

Xref #12849

Warning
DO NOT SQUASH MERGE!

dholth and others added 8 commits September 11, 2023 10:11
* Speed up find_commands() on WSL (#13035)

On WSL, the entire Windows PATH is inherited, and calling `isfile`
(specifically, `os.stat`) across the filesystem boundary is
extremely slow. Delaying the check until after pattern matching
speeds things up considerably.

---------

Co-authored-by: P. Talley <otaithleigh@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com>
Fix `test_s3_server` failure (#12986)
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Sep 12, 2023
@beeankha beeankha changed the base branch from 23.7.x to main September 12, 2023 14:08
@beeankha beeankha requested a review from a team as a code owner September 12, 2023 14:08
@kenodegard kenodegard changed the title 23.7.x resolve merge conflict Merge 23.7.x branch back into main Sep 12, 2023
This was referenced Sep 12, 2023
@kenodegard kenodegard merged commit 1e5d737 into main Sep 12, 2023
79 checks passed
@kenodegard kenodegard deleted the 23.7.x-resolve-conflict branch September 12, 2023 17:10
@jezdez jezdez mentioned this pull request Sep 26, 2023
92 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

4 participants