k3s/cmd/kube-controller-manager
Kubernetes Submit Queue 96f7788f78 Merge pull request #48797 from FengyunPan/fix-empty-cidr
Automatic merge from submit-queue (batch tested with PRs 48231, 47377, 48797, 49020, 49033)

Fix parsing empty CIDR

Fix #48795
Checking ClusterCIDR and ServiceCIDR before parsing them.

**Release note**:
```release-note
NONE
```
2017-07-17 19:37:45 -07:00
..
app Merge pull request #48797 from FengyunPan/fix-empty-cidr 2017-07-17 19:37:45 -07:00
BUILD Convert go_binary linkstamp to x_defs 2017-06-08 14:59:55 -07:00
OWNERS remove some people from OWNERS so they don't get reviews anymore 2017-07-13 10:02:21 -07:00
controller-manager.go copy pkg/util/logs to apiserver 2017-02-13 12:07:15 -05:00