Justin Santa Barbara 89089900d7 Fix merge problems

2015-04-10 13:25:42 -07:00

..

admission

admission: cleanup admission

2015-02-19 22:25:52 -08:00

api

Add initial support for Volumes to AWS

2015-04-10 13:25:42 -07:00

apiserver

Add return types to PUT, POST and PATCH methods.

2015-04-09 20:17:05 -07:00

auth

abac policy file parsing bug

2015-04-02 11:13:20 -04:00

capabilities

Add HostNetworkSources capability to limit use of HostNetwork.

2015-03-25 11:23:06 -07:00

client

Merge pull request #6671 from smarterclayton/ensure_body_is_closed

2015-04-10 11:46:42 -07:00

clientauth

…

cloudprovider

Fix merge problems

2015-04-10 13:25:42 -07:00

config

Performance change to option enable client.QPS, client.Burst

2015-04-10 07:53:54 -05:00

controller

Merge pull request #5270 from lavalamp/fix7

2015-04-07 16:58:09 -04:00

conversion

Fix licensing for forked code.

2015-04-03 17:06:24 -07:00

credentialprovider

Enable usage of a "json key" for authenticating with gcr.io.

2015-03-15 09:24:33 -07:00

fields

Expose Transform() as a method on a field Selector

2015-03-24 17:25:45 -04:00

healthz

Remove global map from healthz

2015-03-19 19:49:44 -04:00

httplog

Add user agent and source IP logging to the httpserver logs.

2015-03-09 17:01:47 -07:00

hyperkube

get rid of pkg/hyperkube

2015-02-20 08:49:12 -08:00

kubectl

Merge pull request #6585 from deads2k/deads-config-takes-factory

2015-04-09 14:54:55 -07:00

kubelet

Merge pull request #6675 from wojtek-t/nodes_support_field_selector

2015-04-10 10:30:55 -07:00

labels

Fixing a lot of string formatting issues with regards to:

2015-03-31 16:47:10 -07:00

master

Merge pull request #6624 from gmarek/status_to_subresource

2015-04-09 16:00:15 -07:00

namespace

Create a new testclient package that can be backed by disk files

2015-04-07 14:56:15 -04:00

probe

refactor pkg/probe ProbeRunners to interfaces and move global probers into kubelet field for testability

2015-02-10 08:30:11 -08:00

proxy

Create a new testclient package that can be backed by disk files

2015-04-07 14:56:15 -04:00

registry

Merge pull request #6686 from derekwaynecarr/terminate_must_have_deletion_timestamp

2015-04-10 10:56:09 -07:00

resourcequota

Create a new testclient package that can be backed by disk files

2015-04-07 14:56:15 -04:00

runtime

Scheduler uses TTLStore for assumed pods

2015-04-08 15:01:04 -07:00

scheduler

Add initial support for Volumes to AWS

2015-04-10 13:25:42 -07:00

service

Copy labels from the service to endpoints that we create.

2015-04-06 13:14:54 -07:00

tools

Removing some references to v1beta1 from test code

2015-04-08 17:28:06 -07:00

types

WIP: Implement multi-port Services

2015-03-30 19:28:11 -07:00

ui

Adding swagger files which got left out of last PR

2015-02-04 18:28:13 -08:00

util

make DeepHashObject use SpewKeys

2015-04-10 09:38:12 -07:00

version

Kubernetes version v0.14.1-dev

2015-04-01 14:51:20 -07:00

volume

Fix tests

2015-04-10 13:25:42 -07:00

watch

Removing some references to v1beta1 from test code

2015-04-08 17:28:06 -07:00