[master] Bump licensing library#1473
Merged
thaJeztah merged 2 commits intodocker:masterfrom Jan 7, 2019
Merged
Conversation
thaJeztah
force-pushed
the
master_bump_licensing_lib
branch
from
99ce4a6 to
945051b
Compare
thaJeztah
changed the title
Member
Author
|
Rebased this, now that #1415 was merged; this should be ready to go now ping @vdemeester @silvin-lubecki @dhiltgen PTAL |
Codecov Report
@@ Coverage Diff @@
## master #1473 +/- ##
=======================================
Coverage 55.33% 55.33%
=======================================
Files 283 283
Lines 19305 19305
=======================================
Hits 10682 10682
Misses 7927 7927
Partials 696 696 |
dhiltgen
approved these changes
Nov 16, 2018
added 2 commits
January 8, 2019 00:35
Removes the billing profile flow which is now handled on the back-end. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com> (cherry picked from commit 8e565d0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com> (cherry picked from commit 0ff9e5c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
master_bump_licensing_lib
branch
from
945051b to
b9f1d30
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ON HOLD: this needs #1415 to be merged firstSecond commit has not been cherry-picked in this PR, as it requires #1415 to be applied cleanly. Pushing this as a PR, but it's not mergable yet, and cherry-picks will have to be re-done once that PR is merged
full diff of the vendor update: docker-archive/licensing@f2eae57...1c117a1
forward-port #1458 to master
conflict in vendor.conf, due to #1339 not being on master
Reverted the
github.com/gogo/googleapisConflict in second commit, because #1415 has not been merged yet on master;
Removes the billing profile flow which is now handled on the back-end.