Merge pull request moby#24501 from hqhq/remove_exec_driver

tiborvass · web-flow · commit 880484992c36 · 2016-07-11T16:54:36.000-07:00
Remove execution driver
diff --git a/api/client/system/info.go b/api/client/system/info.go
@@ -58,7 +58,6 @@ func runInfo(dockerCli *client.DockerCli) error {
 			fmt.Fprintf(dockerCli.Out(), "%s: %s\n", pair[0], pair[1])
 		}
 	}
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Execution Driver: %s\n", info.ExecutionDriver)
 	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Logging Driver: %s\n", info.LoggingDriver)
 	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Cgroup Driver: %s\n", info.CgroupDriver)
 
diff --git a/docs/reference/api/docker_remote_api_v1.25.md b/docs/reference/api/docker_remote_api_v1.25.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
@@ -22,7 +22,6 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
 		"ContainersPaused",
 		"ContainersStopped",
 		"Images",
-		"ExecutionDriver",
 		"LoggingDriver",
 		"OperatingSystem",
 		"NCPU",

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ func runInfo(dockerCli *client.DockerCli) error {`
`58`	`58`	`fmt.Fprintf(dockerCli.Out(), "%s: %s\n", pair[0], pair[1])`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Execution Driver: %s\n", info.ExecutionDriver)`
`62`	`61`	`ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Logging Driver: %s\n", info.LoggingDriver)`
`63`	`62`	`ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Cgroup Driver: %s\n", info.CgroupDriver)`
`64`	`63`