opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5554 from baude/compatfix

Browse Source 
fix reported compat issues
This commit is contained in:
OpenShift Merge Robot
2020-03-19 17:34:39 +01:00
committed by GitHub
parent 49a7856f2e d375424854
commit b43e249b1d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/compat/containers.go
View File

@ -87,7 +87,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)
return return
} }
if _, found := r.URL.Query()["limit"]; found { if _, found := r.URL.Query()["limit"]; found && query.Limit != -1 {
last := query.Limit last := query.Limit
if len(containers) > last { if len(containers) > last {
containers = containers[len(containers)-last:] containers = containers[len(containers)-last:]

2
pkg/api/handlers/utils/containers.go
View File

@ -16,7 +16,7 @@ import (
// ContainerCreateResponse is the response struct for creating a container // ContainerCreateResponse is the response struct for creating a container
type ContainerCreateResponse struct { type ContainerCreateResponse struct {
// ID of the container created // ID of the container created
ID string `json:"id"` ID string `json:"Id"`
// Warnings during container creation // Warnings during container creation
Warnings []string `json:"Warnings"` Warnings []string `json:"Warnings"`
} }