Skip to content

Fix test and lint failures on master - #326

Merged
thaJeztah merged 1 commit into
docker:masterfrom
dnephin:fix-merged-pr-conflicts
Jul 12, 2017
Merged

Fix test and lint failures on master#326
thaJeztah merged 1 commit into
docker:masterfrom
dnephin:fix-merged-pr-conflicts

Conversation

@dnephin

Copy link
Copy Markdown
Contributor

Fix the conflict between the changes in #299 and #277, which just merged together.

Also split up the test cases from #277

Split test cases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
@codecov-io

codecov-io commented Jul 12, 2017

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@bb795aa). Click here to learn what that means.
The diff coverage is n/a.

@@ Coverage Diff @@## master #326 +/- ##
=========================================
Coverage ? 48.71% =========================================
Files ? 186 Lines ? 12413 Branches ? 0 =========================================
Hits ? 6047 Misses ? 5994 Partials ? 372

@vdemeestervdemeester 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 🐯

@thaJeztahthaJeztah 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, thanks! 😅

@thaJeztah

Copy link
Copy Markdown
Member

ignoring codecov guess it's because master was broken

@thaJeztah
thaJeztah merged commit 25d9594 into docker:masterJul 12, 2017
@GordonTheTurtleGordonTheTurtle added this to the 17.07.0 milestone Jul 12, 2017
@dnephin
dnephin deleted the fix-merged-pr-conflicts branch July 12, 2017 16:52
Sign up for freeto 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

@dnephin@codecov-io@thaJeztah@vdemeester@GordonTheTurtle