From 82712ed67ef9c189ccc8837ef8469272c91f6fcf Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Sun, 18 May 2014 01:49:58 +0100 Subject: [PATCH] client: rearrange docker version output Rearrange docker version output so that server output matches client output Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan (github: jmccrohan) --- api/client/commands.go | 2 +- integration-cli/docker_cli_version_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/client/commands.go b/api/client/commands.go index 502c1be69e..532a20cb35 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -385,8 +385,8 @@ func (cli *DockerCli) CmdVersion(args ...string) error { if apiVersion := remoteVersion.Get("ApiVersion"); apiVersion != "" { fmt.Fprintf(cli.out, "Server API version: %s\n", apiVersion) } - fmt.Fprintf(cli.out, "Git commit (server): %s\n", remoteVersion.Get("GitCommit")) fmt.Fprintf(cli.out, "Go version (server): %s\n", remoteVersion.Get("GoVersion")) + fmt.Fprintf(cli.out, "Git commit (server): %s\n", remoteVersion.Get("GitCommit")) release := utils.GetReleaseVersion() if release != "" { fmt.Fprintf(cli.out, "Last stable version: %s", release) diff --git a/integration-cli/docker_cli_version_test.go b/integration-cli/docker_cli_version_test.go index f18d5bede6..822c2b8172 100644 --- a/integration-cli/docker_cli_version_test.go +++ b/integration-cli/docker_cli_version_test.go @@ -24,8 +24,8 @@ func TestVersionEnsureSucceeds(t *testing.T) { "Git commit (client):", "Server version:", "Server API version:", - "Git commit (server):", "Go version (server):", + "Git commit (server):", "Last stable version:", }