Skip to content

Commit

Permalink
Merge branch 'main' into dphulkar/improveLogging
Browse files Browse the repository at this point in the history
  • Loading branch information
wonwuakpa-msft authored Nov 11, 2024
2 parents 514eb06 + b3ba02e commit cd89e2c
Show file tree
Hide file tree
Showing 27 changed files with 719 additions and 737 deletions.
24 changes: 24 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
## Description
<!-- Provide a short summary of the changes in this PR. Explain the purpose, context, and any background information needed to understand the changes. -->

- **Feature / Bug Fix**: (Brief description of the feature or issue being addressed)

- **Related Links**:
- [Issues](<link>)
- [Team thread](<link>)
- [Documents](<link>)
- [Email Subject]

## Type of Change
<!-- Place an 'x' in the relevant box(es) -->

- [ ] Bug fix
- [ ] New feature
- [ ] Documentation update required
- [ ] Code quality improvement
- [ ] Other (describe):

## How Has This Been Tested?
<!-- Describe the testing strategy and any relevant details. Include information on how the change was tested (e.g., unit tests, integration tests, manual testing). If tests were added, specify what scenarios they cover. -->

Thank you for your contribution to AzCopy!
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@

# Change Log

## Version 10.28.0-Preview

### Bug Fixes
1. Fixed an issue where AzCopy would not persist tokens when logging in via Device Code. ([#2361](https://github.com/Azure/azure-storage-azcopy/issues/2361))

## Version 10.27.0

### New Features
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ The general format of the AzCopy commands is: `azcopy [command] [arguments] --[f

* `copy` - Copies source data to a destination location. The supported directions are:
- Local File System <-> Azure Blob (SAS or OAuth authentication)
- Local File System <-> Azure Files (Share/directory SAS authentication)
- Local File System <-> Azure Files (Share/directory SAS or OAuth authentication)
- Local File System <-> Azure Data Lake Storage (ADLS Gen2) (SAS, OAuth, or SharedKey authentication)
- Azure Blob (SAS or public) -> Azure Blob (SAS or OAuth authentication)
- Azure Blob (SAS or public) -> Azure Files (SAS)
- Azure Files (SAS) -> Azure Files (SAS)
- Azure Files (SAS) -> Azure Blob (SAS or OAuth authentication)
- Azure Blob (SAS, OAuth or public authentication) -> Azure Blob (SAS or OAuth authentication)
- Azure Blob (SAS, OAuth or public authentication) -> Azure Files (SAS or OAuth authentication)
- Azure Files (SAS or OAuth authentication) -> Azure Files (SAS or OAuth authentication)
- Azure Files (SAS or OAuth authentication) -> Azure Blob (SAS or OAuth authentication)
- AWS S3 (Access Key) -> Azure Block Blob (SAS or OAuth authentication)
- Google Cloud Storage (Service Account Key) -> Azure Block Blob (SAS or OAuth authentication) [Preview]

* `sync` - Replicate source to the destination location. The supported directions are:
- Local File System <-> Azure Blob (SAS or OAuth authentication)
- Local File System <-> Azure Files (Share/directory SAS authentication)
- Azure Blob (SAS or public) -> Azure Files (SAS)
- Local File System <-> Azure Files (Share/directory SAS or OAuth authentication)
- Azure Blob (SAS, OAuth or public authentication) -> Azure Files (SAS or OAuth authentication)

* `login` - Log in to Azure Active Directory (AD) to access Azure Storage resources.

Expand Down Expand Up @@ -151,4 +151,4 @@ provided by the bot. You will only need to do this once across all repos using o

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
Loading

0 comments on commit cd89e2c

Please sign in to comment.