Rebasing onto latest code and fixing issues

2015-01-13 09:52:37 -08:00
parent c20d062d16
commit dbac18a909
2 changed files with 5 additions and 6 deletions
--- a/pkg/scheduler/predicates.go
+++ b/pkg/scheduler/predicates.go
@@ -259,7 +259,7 @@ func (s *ServiceAffinity) CheckServiceAffinity(pod api.Pod, existingPods []api.P
 			// just use the first service and get the other pods within the service
 			// TODO: a separate predicate can be created that tries to handle all services for the pod
 			selector := labels.SelectorFromSet(services[0].Spec.Selector)
-			servicePods, err := s.podLister.ListPods(selector)
+			servicePods, err := s.podLister.List(selector)
 			if err != nil {
 				return false, err
 			}