From 1de6fda3010e31fac5c1bf66f9cc4c0bcc14c9fe Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Sat, 13 Jun 2015 09:39:19 +0200 Subject: [PATCH] /info: Add keys Architecture, OSType - introduces Swarm-relevant keys, see #13634 - docs updated Signed-off-by: Olle Jonsson --- docs/reference/commandline/info.md | 2 ++ man/docker-info.1.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md index 1794df40..e23d9d67 100644 --- a/docs/reference/commandline/info.md +++ b/docs/reference/commandline/info.md @@ -31,6 +31,8 @@ For example: Execution Driver: native-0.2 Logging Driver: json-file Kernel Version: 3.19.0-22-generic + OSType: linux + Architecture: amd64 Operating System: Ubuntu 15.04 CPUs: 24 Total Memory: 62.86 GiB diff --git a/man/docker-info.1.md b/man/docker-info.1.md index 2abfb0b4..b2b51651 100644 --- a/man/docker-info.1.md +++ b/man/docker-info.1.md @@ -44,6 +44,8 @@ Here is a sample output: Network: bridge null host Kernel Version: 3.13.0-24-generic Operating System: Ubuntu 14.04 LTS + OSType: linux + Architecture: amd64 CPUs: 1 Total Memory: 2 GiB