Merge pull request #486 from ibuildthecloud/godep-3

Update godeps libcompose and docker-from-scratch
rancher · Aug 13, 2015 · afd02bf · afd02bf
2 parents 0e05d1b + 258dd8b
commit afd02bf
Show file tree

Hide file tree

Showing 10 changed files with 207 additions and 73 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/docker/container.go b/Godeps/_workspace/src/github.com/docker/libcompose/docker/container.go
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/docker/convert_test.go b/Godeps/_workspace/src/github.com/docker/libcompose/docker/convert_test.go
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/docker/project.go b/Godeps/_workspace/src/github.com/docker/libcompose/docker/project.go
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/project/project.go b/Godeps/_workspace/src/github.com/docker/libcompose/project/project.go
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/project/project_test.go b/Godeps/_workspace/src/github.com/docker/libcompose/project/project_test.go
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/project/service-wrapper.go b/Godeps/_workspace/src/github.com/docker/libcompose/project/service-wrapper.go
diff --git a/Godeps/_workspace/src/github.com/docker/libcompose/project/types.go b/Godeps/_workspace/src/github.com/docker/libcompose/project/types.go
diff --git a/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scripts/download b/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scripts/download
diff --git a/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scripts/version b/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scripts/version