docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2048 from dongluochen/FixContainerStateString 

Godep update dockerclient
This commit is contained in:
Victor Vieux 2016-03-29 14:08:40 -07:00
parent 3461df4032 ea5f2e0f63
commit 0b50dbd503
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Godeps/Godeps.json generated
View File

@ -1,6 +1,7 @@
{ {
"ImportPath": "github.com/docker/swarm", "ImportPath": "github.com/docker/swarm",
"GoVersion": "go1.5", "GoVersion": "go1.5",
"GodepVersion": "v60",
"Packages": [ "Packages": [
"./..." "./..."
], ],
@ -303,15 +304,15 @@
}, },
{ {
"ImportPath": "github.com/samalba/dockerclient", "ImportPath": "github.com/samalba/dockerclient",
"Rev": "5921830c810f8a9d531ac06070390cd99885db63" "Rev": "52fe1c9d696f36d894d2319f1717a383ebc46f19"
}, },
{ {
"ImportPath": "github.com/samalba/dockerclient/mockclient", "ImportPath": "github.com/samalba/dockerclient/mockclient",
"Rev": "5921830c810f8a9d531ac06070390cd99885db63" "Rev": "52fe1c9d696f36d894d2319f1717a383ebc46f19"
}, },
{ {
"ImportPath": "github.com/samalba/dockerclient/nopclient", "ImportPath": "github.com/samalba/dockerclient/nopclient",
"Rev": "5921830c810f8a9d531ac06070390cd99885db63" "Rev": "52fe1c9d696f36d894d2319f1717a383ebc46f19"
}, },
{ {
"ImportPath": "github.com/samuel/go-zookeeper/zk", "ImportPath": "github.com/samuel/go-zookeeper/zk",

8
Godeps/_workspace/src/github.com/samalba/dockerclient/types.go generated vendored
View File

@ -195,6 +195,10 @@ func (s *State) String() string {
return "Dead" return "Dead"
} }
if s.StartedAt.IsZero() {
return "Created"
}
if s.FinishedAt.IsZero() { if s.FinishedAt.IsZero() {
return "" return ""
} }
@ -219,6 +223,10 @@ func (s *State) StateString() string {
return "dead" return "dead"
} }
if s.StartedAt.IsZero() {
return "created"
}
return "exited" return "exited"
} }