Kubernetes Submit Queue 8679677e87 Merge pull request #47579 from wanghaoran1988/fix_43322 ...

Automatic merge from submit-queue (batch tested with PRs 47958, 46261, 46667, 47709, 47579)

Clean up Deployment overlap annotation code

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #43322

**Special notes for your reviewer**:

**Release note**:

```
None
```

2017-06-23 07:21:36 -07:00

..

BUILD

run hack/update-all

2017-06-22 11:31:03 -07:00

deployment_util_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

deployment_util.go

Merge pull request #47579 from wanghaoran1988/fix_43322

2017-06-23 07:21:36 -07:00

hash_test.go

run root-rewrite-v1-..., compile

2017-06-22 10:25:57 -07:00

pod_util.go

run hack/update-all

2017-06-22 11:31:03 -07:00

replicaset_util.go

run hack/update-all

2017-06-22 11:31:03 -07:00