Browse code

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 <h.huangqiang@huawei.com>
(cherry picked from commit 1fb1136fecfd761300a38f64ac9178979cc0b270)
Signed-off-by: Tibor Vass <tibor@docker.com>

Qiang Huang authored on 2016/07/11 15:52:27
Showing 3 changed files
... ...
@@ -51,7 +51,6 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
51 51
 			fmt.Fprintf(cli.out, "%s: %s\n", pair[0], pair[1])
52 52
 		}
53 53
 	}
54
-	ioutils.FprintfIfNotEmpty(cli.out, "Execution Driver: %s\n", info.ExecutionDriver)
55 54
 	ioutils.FprintfIfNotEmpty(cli.out, "Logging Driver: %s\n", info.LoggingDriver)
56 55
 	ioutils.FprintfIfNotEmpty(cli.out, "Cgroup Driver: %s\n", info.CgroupDriver)
57 56
 
... ...
@@ -2194,7 +2194,6 @@ Display system-wide information
2194 2194
         "DockerRootDir": "/var/lib/docker",
2195 2195
         "Driver": "btrfs",
2196 2196
         "DriverStatus": [[""]],
2197
-        "ExecutionDriver": "native-0.1",
2198 2197
         "ExperimentalBuild": false,
2199 2198
         "HttpProxy": "http://test:test@localhost:8080",
2200 2199
         "HttpsProxy": "https://test:test@localhost:8080",
... ...
@@ -22,7 +22,6 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
22 22
 		"ContainersPaused",
23 23
 		"ContainersStopped",
24 24
 		"Images",
25
-		"ExecutionDriver",
26 25
 		"LoggingDriver",
27 26
 		"OperatingSystem",
28 27
 		"NCPU",