github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15426 from zhengguoyong/adjust_package_name_pkgcontroller

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-13 06:05:23 -07:00
parent 1de4e88022 4ed5f9d240
commit ae9f7c8ff8
38 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/pkg/admission/resourcequota/admission.go
View File

@@ -27,7 +27,7 @@ import (
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller/resourcequota"
resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"

2
plugin/pkg/admission/resourcequota/admission_test.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/unversioned/testclient"
"k8s.io/kubernetes/pkg/controller/resourcequota"
resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota"
)
func getResourceList(cpu, memory string) api.ResourceList {