k8s-merge-robot dd81bf9f9d Merge pull request #19412 from mesosphere/jdef_sync_controllermanager ...

Auto commit by PR queue bot

2016-01-11 00:16:27 -08:00

..

assert

Kubernetes Mesos integration

2015-06-10 20:58:39 +00:00

backoff

Kubernetes Mesos integration

2015-06-10 20:58:39 +00:00

controllermanager

resync the k8s controller manager with the k8sm variant

2016-01-08 16:53:59 +00:00

election

Updating kubernetes proper to use latest etcd client library

2015-12-16 15:56:35 -06:00

executor

Split the Kubelet flag options and struct

2016-01-06 21:23:06 -05:00

hyperkube

Revert "Revert "Add Mesos hyperkube minion server ""

2015-07-31 20:33:04 +02:00

minion

Split the Kubelet flag options and struct

2016-01-06 21:23:06 -05:00

node

Split controller manager options from init

2016-01-06 22:39:14 -05:00

offers

use WithoutCancel interface w/ Pop(nil)

2015-12-12 15:33:48 +00:00

podutil

Refactor the API registration and installation

2015-12-23 22:44:25 -08:00

proc

clean up DATA RACE from Fatalf; avoid returning too early, actually wait for deeply nested actions to complete (flake)

2015-09-25 23:07:49 +00:00

profile

Kubernetes Mesos integration

2015-06-10 20:58:39 +00:00

queue

use WithoutCancel interface w/ Pop(nil)

2015-12-12 15:33:48 +00:00

redirfd

Correcting all go vet errors

2015-08-11 13:55:37 -07:00

runtime

fix #19186

2016-01-10 14:51:20 +00:00

scheduler

avoid updating nf_conntrack-related settings, by default, when running k8s on mesos

2016-01-06 21:57:25 +00:00

service

Switch to versioned ListOptions in client.

2015-12-14 14:26:09 +01:00