Code

Rebase to latest Kubernetes#822

Code

Merged

openshift-bot merged 12 commits intoopenshift:masteropenshift/origin:masterfrom smarterclayton:rebase_kubesmarterclayton/origin:rebase_kubeCopy head branch name to clipboardFeb 2, 2015

+7,948-31,671

Commits

Commits on Feb 1, 2015

• bump(github.com/GoogleCloudPlatform/kubernetes):e335e2d3e26a9a58d3b189ccf41ceb3770d1bfa9

  smarterclayton

  committed
  7043797

  Copy full SHA for 7043797

• UPSTREAM: Disable UIs for Kubernetes and etcd

  smarterclayton

  committed
  361a178

  Copy full SHA for 361a178

• UPSTREAM: Disable auto-pull when tag is "latest"

  smarterclayton

  committed
  5133b9d

  Copy full SHA for 5133b9d

• UPSTREAM: api registration right on mux makes it invisible to container

  Show description for c79fb22
  

  fabianofranz

  authored and

  smarterclayton

  committed
  c79fb22

  Copy full SHA for c79fb22

• UPSTREAM: Allow namespace short to be set

  smarterclayton

  committed
  195f71b

  Copy full SHA for 195f71b

• UPSTREAM: Add 'release' field to raven-go

  smarterclayton

  committed
  f8d42a9

  Copy full SHA for f8d42a9

• UPSTREAM: Support GetByKey so EventStore can de-dup

  smarterclayton

  committed
  9aedd34

  Copy full SHA for 9aedd34

• UPSTREAM: Relax validation around annotations

  smarterclayton

  committed
  8046080

  Copy full SHA for 8046080

• Adapt to upstream changes for cache.Store

  smarterclayton

  committed
  fa5b55e

  Copy full SHA for fa5b55e

• Better debug output in deployment_config_controller

  smarterclayton

  committed
  d4a014b

  Copy full SHA for d4a014b

• Refactor to match upstream master changes

  smarterclayton

  committed
  ad67127

  Copy full SHA for ad67127

• Remove empty log files and use a slightly different process kill method

  smarterclayton

  committed
  2fbc30d

  Copy full SHA for 2fbc30d