Merge pull request openshift#2879 from markturansky/pv_recycler

Merged by openshift-bot
jsafrane · Jun 9, 2015 · e456d58 · e456d58
2 parents aa90d19 + 508684f
commit e456d58
Show file tree

Hide file tree

Showing 31 changed files with 970 additions and 19 deletions.
diff --git a/...b.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/...b.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
diff --git a/.../src/github.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app/plugins.go b/.../src/github.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app/plugins.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing/fuzzer.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing/fuzzer.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/types.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/types.go
diff --git a/...orkspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/conversion_generated.go b/...orkspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/conversion_generated.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/defaults.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/defaults.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/defaults_test.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/defaults_test.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/types.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/types.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1/types.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1/types.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2/types.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2/types.go
diff --git a/...ace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/conversion_generated.go b/...ace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/conversion_generated.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/defaults.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/defaults.go
diff --git a/..._workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/defaults_test.go b/..._workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/defaults_test.go