Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

backport: 1.6.2 backport patches#173

Merged
jcvenegas merged 3 commits intokata-containers:stable-1.6from
ganeshmaharaj:my-1.6.2
Apr 17, 2019
Merged

backport: 1.6.2 backport patches#173
jcvenegas merged 3 commits intokata-containers:stable-1.6from
ganeshmaharaj:my-1.6.2

Conversation

@ganeshmaharaj
Copy link

@ganeshmaharaj ganeshmaharaj commented Apr 16, 2019 •
edited
Loading

Backport includes below changes.

#172
#169
#155

@grahamwhaley
docs: Merge pull request kata-containers#172 from jcvenegas/stable-1.…
4355384 
…5-fix-link

[stable-1.5]docs: Update architecture doc  URL
(cherry picked from commit 88715c4)

Fixes: kata-containers#171

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@ganeshmaharaj ganeshmaharaj requested a review from a team as a code owner April 16, 2019 21:39
@jcvenegas
Copy link
Member

jcvenegas commented Apr 16, 2019

I see quite a lot linter issues.

Julio Montes added 2 commits April 16, 2019 16:18
travis: Merge pull request kata-containers#169 from chavafg/topic/tra…
cd6b560 
…vis-go-version

travis: Update go version on travis
(cherry picked from commit c99869a)

Fixes: kata-containers#168.

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
lint: Merge pull request kata-containers#155 from ganeshmaharaj/go-li…
785467b 
…nter-change

lint: Switch golang linter to golangci-lint
(cherry picked from commit e2b4377)

Fixes kata-containers#156

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@ganeshmaharaj
Copy link
Author

ganeshmaharaj commented Apr 17, 2019

/test

jodh-intel
jodh-intel approved these changes Apr 17, 2019
View reviewed changes
Copy link

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

How are you creating the commits? I do find the "Merge pull request" text a bit confusing as they look like merge commits. The process to follow is documented in https://github.com/kata-containers/community/blob/master/Backport-Guide.md.

@ganeshmaharaj
Copy link
Author

ganeshmaharaj commented Apr 17, 2019

@jodh-intel i cherry-picked them using git cherry-pick -x -m1 <merge SHA> which will get the full delta of the PR if it the PR had multiple commits. I should have stuck to the document. i would be more than happy to re-work the patches if that is more preferrable.

@jcvenegas jcvenegas merged commit b786b18 into kata-containers:stable-1.6 Apr 17, 2019
@jodh-intel
Copy link

jodh-intel commented Apr 17, 2019

@ganeshmaharaj - Let's not worry this time round. But, yes, the doc is supposed to define the process we use. That said, feel free to raise issues/PRs if you think it should change. I also wonder if we could automate more of the backport work to make the results more consistent (and the doc smaller! ;)

@grahamwhaley
Copy link
Contributor

grahamwhaley commented Apr 17, 2019

I know a number of upstream (kernel) maintainers have scripts they use to help automate the backporting. I wonder if any of those are available and suitable (or adaptable)...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@jodh-intel jodh-intel jodh-intel approved these changes

@jcvenegas jcvenegas jcvenegas approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ganeshmaharaj @jcvenegas @jodh-intel @grahamwhaley