summaryrefslogtreecommitdiff
path: root/pkg/api/handlers
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-19 17:34:39 +0100
committerGitHub <noreply@github.com>2020-03-19 17:34:39 +0100
commitb43e249b1d9a8d63335e7c3ac88d6ac68b21e366 (patch)
treedb72a19d0430ccd5bb01b2a2d9902dd29b291e2a /pkg/api/handlers
parent49a7856f2efc0f301bd88b1f3ed6a8fe5d9d0dec (diff)
parentd375424854b93e208c9605a2f1612a88db5035ec (diff)
downloadpodman-b43e249b1d9a8d63335e7c3ac88d6ac68b21e366.tar.gz
podman-b43e249b1d9a8d63335e7c3ac88d6ac68b21e366.tar.bz2
podman-b43e249b1d9a8d63335e7c3ac88d6ac68b21e366.zip
Merge pull request #5554 from baude/compatfix
fix reported compat issues
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r--pkg/api/handlers/compat/containers.go2
-rw-r--r--pkg/api/handlers/utils/containers.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 1298e7fa4..e7031f471 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -87,7 +87,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, err)
return
}
- if _, found := r.URL.Query()["limit"]; found {
+ if _, found := r.URL.Query()["limit"]; found && query.Limit != -1 {
last := query.Limit
if len(containers) > last {
containers = containers[len(containers)-last:]
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index d5a79bdc8..bbe4cee3c 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -16,7 +16,7 @@ import (
// ContainerCreateResponse is the response struct for creating a container
type ContainerCreateResponse struct {
// ID of the container created
- ID string `json:"id"`
+ ID string `json:"Id"`
// Warnings during container creation
Warnings []string `json:"Warnings"`
}