[release/1.2 backport] Correct import path and PusherFunc signature#3219
[release/1.2 backport] Correct import path and PusherFunc signature#3219estesp merged 1 commit intocontainerd:release/1.2from jcordasc:cherrypick-#3213-release-1.2
Conversation
|
EDIT: Sorry, you will need #3229 to be merged before we can get a clean run and you can rebase on |
Correct import path and PusherFunc signature (cherry picked from commit 8722ec0) Signed-off-by: Jared Cordasco <[email protected]>
Codecov Report
@@ Coverage Diff @@
## release/1.2 #3219 +/- ##
============================================
Coverage 43.74% 43.74%
============================================
Files 101 101
Lines 10743 10743
============================================
Hits 4700 4700
Misses 5311 5311
Partials 732 732
Continue to review full report at Codecov.
|
fuweid
left a comment
fuweid
left a comment
There was a problem hiding this comment.
LGTM
nit: the commit is the merged one, not the original one. is it good?
|
@fuweid -- For future reference then, the preference is to cherry-pick the commits from the branch rather than the merge? |
|
Yeah, usually we cherry-pick the actual author commit(s); that way you don't have a cherry-picked commit "authored" (in GitHub terms) by the merging maintainer. No problem. |
5 participants
This backports #3213 to fix an import path (in
services/server/server_solaris.go) andPusherFuncsignature.Signed-off-by: Jared Cordasco [email protected]