Merge pull request #3596 from liggitt/rebase_fixup

Merged by openshift-bot
openshift · Jul 7, 2015 · 91962d9 · 91962d9
2 parents d913366 + da0a3da
commit 91962d9
Show file tree

Hide file tree

Showing 19 changed files with 1,452 additions and 18 deletions.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app/plugins.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app/plugins.go
diff --git a/...s/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/deep_copy_generated.go b/...s/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/deep_copy_generated.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/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/conversion.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/conversion.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/...workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/deep_copy_generated.go b/...workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1/deep_copy_generated.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/...ps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/conversion.go b/...ps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3/conversion.go