github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebased onto the latest changes to the scheduler code

Browse Source
This commit is contained in:
Abhishek Gupta
2015-01-07 18:18:21 -08:00
parent 9e75a05df0
commit 6fd0b181e3
5 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/scheduler/predicates_test.go
View File

@@ -32,9 +32,6 @@ func (n FakeNodeInfo) GetNodeInfo(nodeName string) (*api.Node, error) {
return &node, nil
}
<<<<<<< HEAD
func makeResources(milliCPU int64, memory int64) api.NodeResources {
=======
type FakeNodeListInfo []api.Node
func (nodes FakeNodeListInfo) GetNodeInfo(nodeName string) (*api.Node, error) {
@@ -46,8 +43,7 @@ func (nodes FakeNodeListInfo) GetNodeInfo(nodeName string) (*api.Node, error) {
return nil, fmt.Errorf("Unable to find node: %s", nodeName)
}
func makeResources(milliCPU int, memory int) api.NodeResources {
>>>>>>> e0101c2... Adding service affinity predicate
func makeResources(milliCPU int64, memory int64) api.NodeResources {
return api.NodeResources{
Capacity: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(milliCPU, resource.DecimalSI),