Skip to content

Commit 57d8881

Browse files
author
OpenShift Bot
authored
Merge pull request #13174 from bparees/s2i_bump_1.4
Merged by openshift-bot
2 parents 33183cd + ef130c2 commit 57d8881

File tree

3 files changed

+51
-27
lines changed

3 files changed

+51
-27
lines changed

Godeps/Godeps.json

+49-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/extended/setup.sh

-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ readonly CONFORMANCE_TESTS=(
378378
"\[Feature\:SecurityContext\]"
379379
"should create a LimitRange with defaults"
380380
"Generated release_1_2 clientset"
381-
"\[Feature\:PodDisruptionbudget\]"
382381
"should create a pod that reads a secret"
383382
"should create a pod that prints his name and namespace"
384383
)

vendor/github.com/openshift/source-to-image/pkg/docker/docker.go

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)