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.

Sign up for GitHub

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

[Do not Squash][Storage] Merge master change to Storage branch. #12602

Merged
merged 43 commits into from
Aug 10, 2020
Merged

[Do not Squash][Storage] Merge master change to Storage branch. #12602

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
76570c0
[Storage] Add preview code change (#11474)
blueww Apr 3, 2020
6b92565
[Storage] Fix a missing assembly in move preview changes (#11490)
blueww Apr 7, 2020
bfcd434
Storage 1.13.4-preview (#11487)
dingmeng-xue Apr 10, 2020
c37b97b
[Storage] Add RestorePolicy.LastEnabledTime to cmdlet output (#11665)
blueww Apr 24, 2020
7e0fcb6
[Storage] Support Encryption Scope dataplane (#11676)
blueww Apr 24, 2020
2de9c77
Update the version (#11690)
wyunchi-ms Apr 26, 2020
16ae5f7
[Storage] Support ORS (#11752)
blueww Apr 30, 2020
ad8763c
[Storage] Support rounting preferences (#11778)
blueww May 2, 2020
8d731b2
[Storage] remove duplicated changelog from merge conflict
blueww May 6, 2020
b7c5d21
Merge pull request #11809 from wastoresh/mergestorage
dingmeng-xue May 6, 2020
c9c93d9
[Storage] Support share soft delete (#11779)
blueww May 6, 2020
d70577b
fix merge conflicts
blueww May 6, 2020
cbc7c53
Merge branch 'Az.Storage-preview' into mergestorage
blueww May 6, 2020
88992c8
[Storage] fix CI failure
blueww May 6, 2020
0e23495
Merge pull request #11813 from wastoresh/mergestorage
dingmeng-xue May 7, 2020
5004cdf
fix merge conflicts
blueww May 12, 2020
a71b647
Fix a CI failure
blueww May 12, 2020
e250838
Merge pull request #11880 from wastoresh/mergestorage
VeryEarly May 14, 2020
bc21465
[Storage] Support NFS (#11900)
blueww May 15, 2020
df72db5
merge from master
VeryEarly May 21, 2020
4258738
suppress breaking change issues
VeryEarly May 21, 2020
992f77f
bump up version for Az.Storage
VeryEarly May 21, 2020
ca06a5f
Merge pull request #11967 from VeryEarly/Az.Storage-Preview2
VeryEarly May 21, 2020
14db8a9
[Storage] Support share usage
blueww Feb 11, 2020
20a4761
[Storage] Support share Accesstier
blueww Apr 21, 2020
06f5d6b
Merge pull request #12013 from wastoresh/sharetier
VeryEarly May 29, 2020
415bcbb
fix merge conflicts
blueww Jun 2, 2020
0250bd1
Merge pull request #12043 from wastoresh/mergestorage
VeryEarly Jun 3, 2020
99a484a
upgrade Az.Storage to 2.1.1-preview
VeryEarly Jun 3, 2020
42ab0c3
Merge pull request #12053 from VeryEarly/Az.Storage-preview
VeryEarly Jun 5, 2020
a0e4cd1
fix merge conflicts
blueww Jun 30, 2020
fe455c5
Merge pull request #12295 from wastoresh/mergestorage
VeryEarly Jul 1, 2020
c733cde
fix merge conflicts
blueww Jul 7, 2020
ffcd379
Merge pull request #12345 from wastoresh/mergestorage
wyunchi-ms Jul 8, 2020
578135a
fix merge conflicts
blueww Jul 21, 2020
b992178
fix merge conflicts
blueww Jul 22, 2020
edc3568
Merge pull request #12446 from wastoresh/mergestorage
wyunchi-ms Jul 22, 2020
4dd364e
[Storage] Support blob tag (#12475)
blueww Jul 25, 2020
4847d04
fix merge conflicts
blueww Jul 27, 2020
1cfc32b
Merge pull request #12485 from wastoresh/mergestorage
isra-fel Jul 27, 2020
fb1eabc
[Storage] Fix some test cases (#12497)
blueww Aug 3, 2020
4eac030
Bump up version for Storage OOB release (#12499) (#12598)
isra-fel Aug 7, 2020
0992f85
fix merge conflicts
blueww Aug 7, 2020
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
fix merge conflicts
  • Loading branch information
@blueww
blueww committed Jul 22, 2020
commit b992178dacbc3fe2bd30d5e81da846469cba4d96
2 changes: 1 addition & 1 deletion src/Storage/Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ protected override void DoEndProcessing()
Tuple<string, StorageBlob.CloudBlob> uploadRequest = UploadRequests.DequeueRequest();
IStorageBlobManagement localChannel = Channel;
Func<long, Task> taskGenerator;
if (!UseTrack2SDK() && string.IsNullOrEmpty(this.EncryptionScope))
if (!UseTrack2Sdk() && string.IsNullOrEmpty(this.EncryptionScope))
{
//Upload with DMlib
taskGenerator = (taskId) => Upload2Blob(taskId, localChannel, uploadRequest.Item1, uploadRequest.Item2);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.