kube rebase 4c8e6f47ec23f390978e651232b375f5f9cde3c7#5143

Merged

openshift-bot merged 35 commits intoopenshift:masterfrom

Oct 19, 2015

Commits on Oct 19, 2015

bump(github.com/prometheus/client_golang): 3b78d7a77f51ccbc364d4bc170920153022cfd08
deads2k
committed
bump(github.com/fsouza/go-dockerclient): 1399676f53e6ccf46e0bf00751b21bed329bc60e
deads2k
committed
bump(github.com/ghodss/yaml): 73d445a93680fa1a78ae23a5839bad48f32ba1ee
deads2k
committed
bump(github.com/coreos/go-etcd): de3514f25635bbfb024fdaf2a8d5f67378492675
deads2k
committed
bump(k8s.io/kubernetes): 4c8e6f47ec23f390978e651232b375f5f9cde3c7
deads2k
committed
UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd
deads2k
committed
UPSTREAM: <carry>: Allow pod start to be delayed in Kubelet

smarterclayton
authored and
deads2k
committed
UPSTREAM: <carry>: SCC
deads2k
committed
UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data

liggitt
authored and
deads2k
committed
UPSTREAM: <carry>: helper methods paralleling old latest fields
deads2k
committed
UPSTREAM: <carry>: reallow the ability to post across namespaces in api

Paul Weil
authored and
deads2k
committed
UPSTREAM: <carry>: update describer for dockercfg secrets
deads2k
committed
UPSTREAM: <carry>: Disable --validate by default

0xmichalis
authored and
deads2k
committed
UPSTREAM: <carry>: Back n forth downward/metadata conversions
deads2k
committed
UPSTREAM: <carry>: support pointing oc exec to old openshift server
deads2k
committed
UPSTREAM: <carry>: v1beta3
deads2k
committed
UPSTREAM: <none>: Suppress aggressive output of warning

smarterclayton
authored and
deads2k
committed
UPSTREAM: <none>: Hack date-time format on *util.Time

smarterclayton
authored and
deads2k
committed
UPSTREAM: <drop>: add back flag types to reduce noise during this rebase
deads2k
committed
UPSTREAM: <drop>: make test pass with old codec
deads2k
committed
UPSTREAM: <drop>: tweak generator to handle conversions in other packages
deads2k
committed
UPSTREAM: 8890: Allowing ActiveDeadlineSeconds to be updated for a pod
deads2k
committed
UPSTREAM: 15232: refactor logs to be composeable
deads2k
committed
UPSTREAM: 12498: Re-add timeouts for kubelet which is not in the upstream PR.
deads2k
committed
UPSTREAM: 11827: allow permissive SA secret ref limitting
deads2k
committed
UPSTREAM: 14496: deep-copies: Structs cannot be nil

0xmichalis
authored and
deads2k
committed
UPSTREAM: 15451 <partial>: Add our types to kubectl get error

smarterclayton
authored and
deads2k
committed
UPSTREAM: TODO: expose ResyncPeriod function
deads2k
committed
UPSTREAM: 15807: Platform-specific setRLimit implementations

liggitt
authored and
deads2k
committed
UPSTREAM: 12221: Allow custom namespace creation in e2e framework
deads2k
committed
UPSTREAM: openshift-sdn(TODO): handle boring upstream refactors
deads2k
committed
UPSTREAM: openshift-sdn(TODO): update for iptables.New call
deads2k
committed
refactors
deads2k
committed
help unit tests compile

soltysh
authored and
deads2k
committed
Disable v1beta3 in REST API

ironcladlou
authored and
deads2k
committed