vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge 38cba478b8 into 96cc03ccd9

Browse source
This commit is contained in:
Xianglin Gao 2016-10-11 08:02:37 +00:00 • committed by GitHub
commit 6b19679f46
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vendor/src/github.com/opencontainers/runc/libcontainer/utils/utils.go vendored
View file

@ -102,7 +102,7 @@ func SearchLabels(labels []string, query string) string {
} }
// Annotations returns the bundle path and user defined annotations from the // Annotations returns the bundle path and user defined annotations from the
// libcontianer state. We need to remove the bundle because that is a label // libcontainer state. We need to remove the bundle because that is a label
// added by libcontainer. // added by libcontainer.
func Annotations(labels []string) (bundle string, userAnnotations map[string]string) { func Annotations(labels []string) (bundle string, userAnnotations map[string]string) {
userAnnotations = make(map[string]string) userAnnotations = make(map[string]string)