Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 20, 2019

Marking as WIP because this is based on #1959 rebased

Backports of:

Also reformats the vendor.conf, similar to #1822

@codecov-io
Copy link

codecov-io commented Jun 20, 2019

Codecov Report

Merging #1961 into 18.09 will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            18.09    #1961   +/-   ##
=======================================
  Coverage   54.29%   54.29%           
=======================================
  Files         291      291           
  Lines       19459    19459           
=======================================
  Hits        10565    10565           
  Misses       8214     8214           
  Partials      680      680

Ian Campbell and others added 5 commits July 23, 2019 16:01
I would like to use the regex matcher

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 986196e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
To make it better readable, and to encourage pinning
by sha, but "align" to a tagged release.

similar to 6026ce4 (docker#1822)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c8d6854)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This helps merge conflicts in situations where downstream
projects have additional dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8c5460a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_format_vendor branch from 12273ff to 7b3d023 Compare July 23, 2019 23:02
@thaJeztah thaJeztah changed the title [WIP][18.09 backport] bump gotest.tools 2.3.0, and reformat vendor.conf [18.09 backport] bump gotest.tools 2.3.0, and reformat vendor.conf Jul 23, 2019
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@kolyshkin kolyshkin merged commit 62f123f into docker:18.09 Jul 23, 2019
@thaJeztah thaJeztah deleted the 18.09_format_vendor branch July 23, 2019 23:34
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