Sunil Arora 4d5b96f94e fixed conflict resolution behavior while apply podpresets

2017-07-21 13:19:57 -07:00

..

cmd/kube-scheduler

Merge pull request #48526 from jianglingxia/jlx0706

2017-07-21 04:20:45 -07:00

pkg

fixed conflict resolution behavior while apply podpresets

2017-07-21 13:19:57 -07:00

BUILD

Simply changed the names of packages of some admission plugins.

2017-06-05 22:23:42 +02:00

OWNERS

Updated top level owners file to match new format

2017-01-19 11:29:16 -08:00