Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Oct 22, 2018

ON HOLD: this needs #1415 to be merged first

Second 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

git checkout -b master_bump_licensing_lib upstream/master
git cherry-pick -s -S -x 8e565d03995c582b607c2e903824684060dd8fb0
git cherry-pick -s -S -x 0ff9e5cd10718af0649c6977fb043f6849802c63

conflict in vendor.conf, due to #1339 not being on master

diff --cc vendor.conf
index 792143bd,d05ff4b0..00000000
--- a/vendor.conf
+++ b/vendor.conf
@@@ -22,11 -22,11 +22,16 @@@ github.com/docker/go-events 9461782956a
  github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
  github.com/docker/go-units 47565b4f722fb6ceae66b95f853feed578a4a51c # v0.3.3
  github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
++<<<<<<< HEAD
 +github.com/docker/licensing f2eae57157a06681b024f1690923d03e414179a0
 +github.com/docker/swarmkit 9f271c2963d18a7c60d2c4001fb418ca4037df19
++=======
+ github.com/docker/licensing 1c117a1720cb413dd6a101d36a6c567b1ccb90fe
+ github.com/docker/swarmkit cfa742c8abe6f8e922f6e4e920153c408e7d9c3b
++>>>>>>> 8e565d03... Bump licensing library
  github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
  github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 # v1.0.0
 -github.com/gogo/googleapis b23578765ee54ff6bceff57f397d833bf4ca6869
 +github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
  github.com/gogo/protobuf v1.1.1
  github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
  github.com/golang/protobuf v1.1.0

Reverted the github.com/gogo/googleapis

Conflict in second commit, because #1415 has not been merged yet on master;

	both modified:   cli/command/engine/activate_test.go
	both modified:   internal/licenseutils/utils.go
	both modified:   internal/licenseutils/utils_test.go

Removes the billing profile flow which is now handled on the back-end.

@thaJeztah thaJeztah force-pushed the master_bump_licensing_lib branch from 99ce4a6 to 945051b Compare November 15, 2018 13:32
@thaJeztah thaJeztah changed the title [WIP] [master] Bump licensing library [master] Bump licensing library Nov 15, 2018
@thaJeztah
Copy link
Member Author

Rebased this, now that #1415 was merged; this should be ready to go now

ping @vdemeester @silvin-lubecki @dhiltgen PTAL

@thaJeztah thaJeztah added this to the 19.03.0 milestone Nov 15, 2018
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🎋

@codecov-io
Copy link

codecov-io commented Nov 15, 2018

Codecov Report

Merging #1473 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master    #1473   +/-   ##
=======================================
  Coverage   55.33%   55.33%           
=======================================
  Files         283      283           
  Lines       19305    19305           
=======================================
  Hits        10682    10682           
  Misses       7927     7927           
  Partials      696      696

Daniel Hiltgen 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 thaJeztah force-pushed the master_bump_licensing_lib branch from 945051b to b9f1d30 Compare January 7, 2019 23:35
@thaJeztah thaJeztah merged commit 7d9f2af into docker:master Jan 7, 2019
@thaJeztah thaJeztah deleted the master_bump_licensing_lib branch January 7, 2019 23:41
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