Merge pull request #6827 from openshift/s2i_bump

Merged by openshift-bot
openshift · Jan 27, 2016 · a1c70de · a1c70de
2 parents ec8fe7e + 55e826e
commit a1c70de
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 32 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/openshift/source-to-image/pkg/api/types.go b/Godeps/_workspace/src/github.com/openshift/source-to-image/pkg/api/types.go
diff --git a/...orkspace/src/github.com/openshift/source-to-image/pkg/build/strategies/layered/layered.go b/...orkspace/src/github.com/openshift/source-to-image/pkg/build/strategies/layered/layered.go
diff --git a/...orkspace/src/github.com/openshift/source-to-image/pkg/build/strategies/onbuild/onbuild.go b/...orkspace/src/github.com/openshift/source-to-image/pkg/build/strategies/onbuild/onbuild.go
diff --git a/Godeps/_workspace/src/github.com/openshift/source-to-image/pkg/build/strategies/sti/sti.go b/Godeps/_workspace/src/github.com/openshift/source-to-image/pkg/build/strategies/sti/sti.go
diff --git a/Godeps/_workspace/src/github.com/openshift/source-to-image/pkg/docker/docker.go b/Godeps/_workspace/src/github.com/openshift/source-to-image/pkg/docker/docker.go