Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dacfbc1
Revert change to acs_connection_id type
diondrapeck Jan 24, 2024
a9fc28f
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Jan 25, 2024
594794d
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Jan 25, 2024
9ed7442
Resolve merge conflict
diondrapeck Jan 29, 2024
9495639
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Jan 31, 2024
eb4669d
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 5, 2024
a1bc7b3
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 5, 2024
12a43ef
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 7, 2024
16bebb4
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 8, 2024
e5ee79f
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 20, 2024
e9fdd4f
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 21, 2024
04f17be
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 21, 2024
015db3d
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 22, 2024
91abebd
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Mar 1, 2024
bddcb84
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Mar 1, 2024
a0982e0
Address remaining type issues
diondrapeck Mar 2, 2024
5263c6a
Revert changes to irrelevant files
diondrapeck Mar 2, 2024
dd75b4b
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Mar 2, 2024
9363753
Resolve merge conflict
diondrapeck Mar 2, 2024
804c3b5
Add whitespace back
diondrapeck Mar 2, 2024
26da46a
Remove unintentional change
diondrapeck Mar 2, 2024
c1dd47f
Remove Optional type annotation from get() methods
diondrapeck Mar 4, 2024
48961be
Remove duplicate overloads
diondrapeck Mar 4, 2024
a6b3627
Fix circular import
diondrapeck Mar 4, 2024
f8bbff6
Revert lost input/output overload types
diondrapeck Mar 4, 2024
a57fd06
Remove duplicate overloads for uri_folder
diondrapeck Mar 4, 2024
7770f53
Resolve merge conflict
diondrapeck Mar 4, 2024
2ae891a
Resolve merge conflict
diondrapeck Mar 4, 2024
3861412
Use type:ignore to silence known incompatibilities
diondrapeck Mar 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
  • Loading branch information
diondrapeck committed Feb 22, 2024
commit 015db3d7eb02848909d3d8ff61ba6dccd9655c29

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.