whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into release-1.4

Browse Source
This commit is contained in:
Devin Donnelly
2016-09-23 16:57:30 -07:00
parent a926c3959e 51add3e397
commit f4457ae677
21 changed files with 155 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/examples_test.go
+1 -1
View File
@@ -33,7 +33,7 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions"
expvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
"k8s.io/kubernetes/pkg/capabilities"
"k8s.io/kubernetes/pkg/registry/job"
"k8s.io/kubernetes/pkg/registry/batch/job"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util/validation/field"