toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17350 from vdemeester/11699-auto-libraryimport

Browse Source 
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
This commit is contained in:
David Calavera
2015-10-27 13:39:40 -07:00
parent 95c227e717 4d261096ec
commit 9cd08e6796
21 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/execdriver/windows/windows.go
View File

@ -8,9 +8,9 @@ import (
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/version"
)
// This is a daemon development variable only and should not be
@ -24,7 +24,7 @@ var forceKill bool
// Define name and version for windows
var (
DriverName = "Windows 1854"
Version = dockerversion.VERSION + " " + dockerversion.GITCOMMIT
Version = version.VERSION + " " + version.GITCOMMIT
)
type activeContainer struct {