Skip to content

Fix conflict resolution of uploadFileWithHeaders#33815

Merged
phil-davis merged 1 commit into
masterfrom
fix-uploadFileWithHeaders-conflict-resolution
Dec 7, 2018
Merged

Fix conflict resolution of uploadFileWithHeaders#33815
phil-davis merged 1 commit into
masterfrom
fix-uploadFileWithHeaders-conflict-resolution

Conversation

@phil-davis

@phil-davis phil-davis commented Dec 7, 2018

Copy link
Copy Markdown
Contributor

Description

  • pass $noOfChunks to uploadFileWithHeaders()
  • add in the code related to pauseUpload()

Motivation and Context

Conflict resolution in #33784 missed changes that happened at a similar time for upload timing issues - adding pauseUpload() #33795

Also the new call to uploadFileWithHeaders() needs to pass $noOfChunks

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@phil-davis

Copy link
Copy Markdown
Contributor Author

Backport stable10 #33818

@codecov

codecov Bot commented Dec 7, 2018

Copy link
Copy Markdown

Codecov Report

Merging #33815 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #33815   +/-   ##
=========================================
  Coverage     64.35%   64.35%           
  Complexity    18309    18309           
=========================================
  Files          1195     1195           
  Lines         69255    69255           
  Branches       1276     1276           
=========================================
  Hits          44566    44566           
  Misses        24317    24317           
  Partials        372      372
Flag Coverage Δ Complexity Δ
#javascript 52.98% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.66% <ø> (ø) 18309 <ø> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ac0f01b...a35998b. Read the comment docs.

1 similar comment
@codecov

codecov Bot commented Dec 7, 2018

Copy link
Copy Markdown

Codecov Report

Merging #33815 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #33815   +/-   ##
=========================================
  Coverage     64.35%   64.35%           
  Complexity    18309    18309           
=========================================
  Files          1195     1195           
  Lines         69255    69255           
  Branches       1276     1276           
=========================================
  Hits          44566    44566           
  Misses        24317    24317           
  Partials        372      372
Flag Coverage Δ Complexity Δ
#javascript 52.98% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.66% <ø> (ø) 18309 <ø> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ac0f01b...a35998b. Read the comment docs.

@phil-davis phil-davis merged commit dfd3dff into master Dec 7, 2018
@delete-merged-branch delete-merged-branch Bot deleted the fix-uploadFileWithHeaders-conflict-resolution branch December 7, 2018 14:36
@lock lock Bot locked as resolved and limited conversation to collaborators Dec 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants