Skip to content

Fix progress reporting for containerd pulls#1319

Merged
thaJeztah merged 1 commit into
docker:masterfrom
dhiltgen:fix_progress_master
Aug 29, 2018
Merged

Fix progress reporting for containerd pulls#1319
thaJeztah merged 1 commit into
docker:masterfrom
dhiltgen:fix_progress_master

Conversation

@dhiltgen

Copy link
Copy Markdown
Contributor

During refactoring of the implementation PR progress reporting
was broken. This gets the progress reporting back in action.

Signed-off-by: Daniel Hiltgen daniel.hiltgen@docker.com
(cherry picked from commit 7f4c842)
Signed-off-by: Daniel Hiltgen daniel.hiltgen@docker.com

Cherry-pick of #1311

During refactoring of the implementation PR progress reporting
was broken.  This gets the progress reporting back in action.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 7f4c842)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #1319 into master will not change coverage.
The diff coverage is 66.66%.

@@           Coverage Diff           @@
##           master    #1319   +/-   ##
=======================================
  Coverage   54.73%   54.73%           
=======================================
  Files         292      292           
  Lines       19267    19267           
=======================================
  Hits        10545    10545           
  Misses       8063     8063           
  Partials      659      659

@vdemeester vdemeester left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯
That said, we tend to do the opposite (i.e. fixing in master, cherry-picking in the release branch)

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit ead40ca into docker:master Aug 29, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.09.0 milestone Aug 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants