From 88d82eee4b68bbc67b4b51b604d09e1face296a5 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Mon, 11 Jul 2016 14:52:27 +0800 Subject: [PATCH] Remove execution driver We use containerd and there is no execution driver anymore. Addresses: https://github.com/docker/docker/issues/24461 Signed-off-by: Qiang Huang (cherry picked from commit 1fb1136fecfd761300a38f64ac9178979cc0b270) Signed-off-by: Tibor Vass --- api/client/info.go | 1 - docs/reference/api/docker_remote_api_v1.24.md | 1 - integration-cli/docker_api_info_test.go | 1 - 3 files changed, 3 deletions(-) diff --git a/api/client/info.go b/api/client/info.go index de7e5828f1..a84e6217a4 100644 --- a/api/client/info.go +++ b/api/client/info.go @@ -51,7 +51,6 @@ func (cli *DockerCli) CmdInfo(args ...string) error { fmt.Fprintf(cli.out, "%s: %s\n", pair[0], pair[1]) } } - ioutils.FprintfIfNotEmpty(cli.out, "Execution Driver: %s\n", info.ExecutionDriver) ioutils.FprintfIfNotEmpty(cli.out, "Logging Driver: %s\n", info.LoggingDriver) ioutils.FprintfIfNotEmpty(cli.out, "Cgroup Driver: %s\n", info.CgroupDriver) diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index d25fb8987d..1598034d8e 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -2194,7 +2194,6 @@ Display system-wide information "DockerRootDir": "/var/lib/docker", "Driver": "btrfs", "DriverStatus": [[""]], - "ExecutionDriver": "native-0.1", "ExperimentalBuild": false, "HttpProxy": "http://test:test@localhost:8080", "HttpsProxy": "https://test:test@localhost:8080", diff --git a/integration-cli/docker_api_info_test.go b/integration-cli/docker_api_info_test.go index f80b8a198c..2ff69c0596 100644 --- a/integration-cli/docker_api_info_test.go +++ b/integration-cli/docker_api_info_test.go @@ -22,7 +22,6 @@ func (s *DockerSuite) TestInfoApi(c *check.C) { "ContainersPaused", "ContainersStopped", "Images", - "ExecutionDriver", "LoggingDriver", "OperatingSystem", "NCPU",