github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-12-25 06:02:30 +00:00
Code Issues Projects Releases Wiki Activity
2,343 Commits 35 Branches 1,532 Tags
release-1.18
Commit Graph

7 Commits

Author SHA1 Message Date
coryrc
8c19b9f4a6 Clarify client-go issue location (#85464) 
* Clarify client-go issue location

While pull requests should be in kubernetes/kubernetes, it seems issues are
tracked in client-go repo.

* All Issues along with PRs (except README.md) should be opened in kubernetes/kubernetes

Kubernetes-commit: bc53b97ceb25338570a853845c4cdd295468ed61
 2019-12-04 08:25:17 +00:00
Nikhita Raghunath
0e1c000cb7 Fix CONTRIBUTING.md to avoid conflicts while publishing 
Comparing the history of:

- the CONTRIBUTING.md file in k/client-go: https://github.com/kubernetes/client-go/commits/master/CONTRIBUTING.md and
- the CONTRIBUTING.md file in staging: https://github.com/kubernetes/kubernetes/commits/master/staging/src/k8s.io/client-go/CONTRIBUTING.md

We see that the one in staging diverged from the one being published,
_even though commits were being published the bot_. The divergence occurs
because the one in staging lacks the following commit:
12a6e5ed0a (diff-6a3371457528722a734f3c51d9238c13).

This occurred because we merged a PR to k/client-go directly
(https://github.com/kubernetes/client-go/pull/421) long ago, which
instead should have been routed through staging.

The commits that were created through staging after the above PR was
merged were still being published by the bot because they didn't
introduce conflicts (and we never found out about it since no conflicts
were detected).

Recently, a PR (https://github.com/kubernetes/kubernetes/pull/85464)
introduced changes that touched the line changed by the
offending/divergent commit. When these changes were cherry-picked to the
master branch to be published, the bot complained with conflicts.

This PR brings the CONTRIBUTING.md file to a state
(36065c6dd7/staging/src/k8s.io/client-go/CONTRIBUTING.md)
before the new PR (https://github.com/kubernetes/kubernetes/pull/85464),
so that cherry-picking the changes in this PR to the master branch won't
introduce conflicts anymore.
 2019-12-04 13:06:05 +05:30
Xiang Dai
879ff4004d delete all duplicate empty blanks 
Signed-off-by: Xiang Dai <764524258@qq.com>

Kubernetes-commit: 36065c6dd717c14e0a90131041e20345a7e5e324
 2019-02-22 09:43:51 +08:00
Ben Moss
6320f74bd6 Update deprecated links 
Kubernetes-commit: 34ac4d9ee9fed65d770403fff4cb037253fc5d09
 2019-02-04 13:28:31 -05:00
Misty Stanley-Jones
12a6e5ed0a Document that changes to the README.md are done in this repo 
Signed-off-by: Misty Stanley-Jones <mistyhacks@google.com>
 2018-05-25 10:32:46 -07:00
pigletfly
68154ad48f Fix typo 
Kubernetes-commit: 5eba676508af6571e38b8b37dd4cde6efd33acd3
 2018-02-01 19:11:19 +08:00
Aaron Crickenberger
de090a6a8d Treat staging repos as authoritative for all files 
Move files from kubernetes/foo root back to
kubernetes/kubernetes/staging/src/k8s.io/foo root

Then:
- add CONTRIBUTING.md for all staging repos
- add .PULL_REQUEST_TEMPLATE to all staging repos
- ignore .github while diffing generated protobuf

Kubernetes-commit: d9b5773101e930431f24fe178d988271c1becc35
 2017-12-22 17:09:51 -05:00