1. 21 Sep, 2016 2 commits
    • Kubernetes Submit Queue's avatar
      Merge pull request #32276 from YuPengZTE/devERR · 95dd65c9
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue
      
      In error, the first letter is low-case letter
      95dd65c9
    • Kubernetes Submit Queue's avatar
      Merge pull request #33055 from dchen1107/test1 · aa5372c5
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue
      
      Fix backward compatibility issue caused by promoting initcontainers f…
      
      #31026 moves init-container feature from alpha to beta, but only took care the backward compatibility for pod specification, not deal with status. For status, it simply moved from `pods.beta.kubernetes.io/init-container-statuses` to
      `pods.beta.kubernetes.io/init-container-statuses` instead of introducing one more pods.beta.kubernetes.io/init-container-statuses. This breaks when the cluster is running with 1.4, but the user is still running with kubectl 1.3.x. 
      
      Fixed #32711
      aa5372c5
  2. 20 Sep, 2016 38 commits