jennybuckley eb1dca3a06 Fix conflicts

2018-07-02 16:03:40 -07:00

..

admissionregistration.k8s.io

Merge pull request #62755 from kubernetes/master

2018-04-17 16:12:13 -07:00

apps

Merge remote-tracking branch 'upstream/master' into sync-with-master-2

2018-07-02 12:47:58 -07:00

authentication.k8s.io

generated: Run update scripts after api change

2018-04-16 14:37:11 -07:00

authorization.k8s.io

generated: Run update scripts after api change

2018-04-16 14:37:11 -07:00

autoscaling

generated: Run update scripts after api change

2018-04-16 14:37:11 -07:00

batch

Merge remote-tracking branch 'upstream/master' into sync-with-master-2

2018-07-02 12:47:58 -07:00

certificates.k8s.io/v1beta1

Merge remote-tracking branch 'kubernetes/master' into sync-with-master

2018-06-04 11:21:11 -07:00

coordination.k8s.io/v1beta1

Fix conflicts

2018-07-02 16:03:40 -07:00

events.k8s.io/v1beta1

generated: Run update scripts after api change

2018-04-16 14:37:11 -07:00

extensions/v1beta1

Merge remote-tracking branch 'upstream/master' into sync-with-master-2

2018-07-02 12:47:58 -07:00

networking.k8s.io/v1

generated: Run update scripts after api change

2018-04-16 14:37:11 -07:00

policy/v1beta1

Merge branch 'master' into feature-serverside-apply

2018-06-11 11:28:56 -07:00

rbac.authorization.k8s.io

Merge "master" into "feature-serverside-apply"

2018-05-08 15:24:14 -07:00

scheduling.k8s.io

Merge branch 'master' into feature-serverside-apply

2018-05-23 13:53:46 -07:00

settings.k8s.io/v1alpha1

Merge remote-tracking branch 'upstream/master' into sync-with-master-2

2018-07-02 12:47:58 -07:00

storage.k8s.io

Merge branch 'master' into feature-serverside-apply

2018-06-11 11:28:56 -07:00

v1

Merge remote-tracking branch 'upstream/master' into sync-with-master-2

2018-07-02 12:47:58 -07:00

OWNERS

Create api-{approvers,reviewers} alias

2017-10-18 10:54:28 -07:00