1. 16 Jul, 2016 2 commits
    • k8s-merge-robot's avatar
      Merge pull request #28876 from thockin/kube-proxy-scale-conntrack-by-cores · 6f98b693
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Scale kube-proxy conntrack limits by cores (new default behavior)
      
      For large machines we want more conntrack entries than smaller machines.
      
      Commence bike-shedding on names and values and semantics.  I'd love to get this in as a patch to 1.3.x since we have had some trouble for users on large machines.
      
      Fixes #28867
      6f98b693
    • k8s-merge-robot's avatar
      Merge pull request #28976 from coufon/debug_mirror_pod_test · 5b027a58
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Fix a bug in mirror pod node e2e test.
      
      Fixed a bug in test/e2e_node/mirror_pod_test.go. The function 'checkMirrorPodDisappear' returns nil even when the pod does not disappear. It should return a non-nil error. 
      
      @Random-Liu 
      5b027a58
  2. 15 Jul, 2016 38 commits