Merge remote-tracking branch 'origin/master' into release-1.8

Kubernetes-commit: 783e2305f10d452b0549578535350cda83649f6c
This commit is contained in:
Kubernetes Publisher
2017-09-12 17:25:11 -07:00
3 changed files with 77 additions and 25 deletions

50
Godeps/Godeps.json generated
View File

@@ -376,103 +376,103 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "07b4b4eaaae3ae86db8b37558fb20a61933ea428"
"Rev": "79875ce1be3143a6a7e07c40b8cbab654b247233"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",