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#1544

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

backport: 1.6.2 backport patches#1544
egernst merged 6 commits intokata-containers:stable-1.6from
ganeshmaharaj:my-1.6.2

Conversation

@ganeshmaharaj
Copy link
Copy Markdown
Contributor

@ganeshmaharaj ganeshmaharaj commented Apr 16, 2019

Backports include below changes

#1502
#1441
#1518
#1509
#1494

@ganeshmaharaj
Copy link
Copy Markdown
Contributor Author

/test

amshinde and others added 3 commits April 16, 2019 11:37
…c-default

network: Make tcfilter model as default
(cherry picked from commit edc77a0)

Fixes: kata-containers#1501

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
config: fix panic in type assertion
(cherry picked from commit 303f126)

Fixes: kata-containers#1440

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
…fixtop

virtcontainers: prepend a kata specific string to host cgroups path
(cherry picked from commit d99693a)

Fixes: kata-containers#1488

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

/retest

ganeshmaharaj pushed a commit to ganeshmaharaj/kata-tests that referenced this pull request Apr 16, 2019
…fixcgrouppath

cgroup_test: prepend a kata specific string to host cgroup path
(cherry picked from commit 28bfe35)

Fixes:kata-containers#1461

Depends-on:github.com/kata-containers/runtime#1544

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
Fixes: kata-containers#1545

Depends-on:github.com/kata-containers/tests#1479

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

/retest

lifupan and others added 2 commits April 16, 2019 14:21
cli: fix kata-check test
(cherry picked from commit da08b3a)

Fixes: kata-containers#1508

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
shimv2: fix the issue of stop container failed
(cherry picked from commit c08976e)

Fixes:kata-containers#1493

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@jcvenegas
Copy link
Copy Markdown
Member

looks good:
I wonder if #1502 is really a fix for 1.6 or a more a different way to do things for 1.7, I feel the second @egernst I see you mark it so lets include it.

@ganeshmaharaj
Copy link
Copy Markdown
Contributor Author

/retest

@egernst
Copy link
Copy Markdown
Member

egernst commented Apr 17, 2019

@jcvenegas i think its good to have it as default, so #1502 should be included.

@egernst egernst merged commit 2b6dcea into kata-containers:stable-1.6 Apr 17, 2019
@ganeshmaharaj ganeshmaharaj deleted the my-1.6.2 branch July 17, 2019 17:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants