diff options
| author | jortkoopmans <jort@jabo-solutions.eu> | 2020-11-30 15:58:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 15:58:23 +0100 |
| commit | 84e8b2afa795ca060f4d2c5206f47d320292ed9b (patch) | |
| tree | ea0e985d3f50d389b33fdb403d240e817251fd8c /pkg/api | |
| parent | 5cfbe0b78e3672dd67cd028b85d816fc19d6a614 (diff) | |
| parent | fc85ec942ee3273f5ad56381a0f6b9e78aea59bf (diff) | |
| download | podman-84e8b2afa795ca060f4d2c5206f47d320292ed9b.tar.gz podman-84e8b2afa795ca060f4d2c5206f47d320292ed9b.tar.bz2 podman-84e8b2afa795ca060f4d2c5206f47d320292ed9b.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/ping.go | 3 | ||||
| -rw-r--r-- | pkg/api/server/register_ping.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/ping.go b/pkg/api/handlers/compat/ping.go index 06150bb63..9f6611b30 100644 --- a/pkg/api/handlers/compat/ping.go +++ b/pkg/api/handlers/compat/ping.go @@ -19,11 +19,10 @@ func Ping(w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "no-cache") w.Header().Set("Pragma", "no-cache") - w.Header().Set("Libpod-Buildha-Version", buildah.Version) + w.Header().Set("Libpod-Buildah-Version", buildah.Version) w.WriteHeader(http.StatusOK) if r.Method == http.MethodGet { fmt.Fprint(w, "OK") } - fmt.Fprint(w, "\n") } diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go index 4e299008c..446a12a68 100644 --- a/pkg/api/server/register_ping.go +++ b/pkg/api/server/register_ping.go @@ -53,7 +53,7 @@ func (s *APIServer) registerPingHandlers(r *mux.Router) error { // Max Podman API Version the server supports. // Available if service is backed by Podman, therefore may be used to // determine if talking to Podman engine or another engine - // Libpod-Buildha-Version: + // Libpod-Buildah-Version: // type: string // description: | // Default version of libpod image builder. |