Skip to content

Commit 089753e

Browse files
author
Rodolfo Sanchez
authored
Merge branch 'kubernetes:master' into patch-1
2 parents f245605 + 0e674fc commit 089753e

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

contributors/devel/development.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,8 @@ different versions of Kubernetes.
284284
| 1.17 - 1.18 | 1.13.15 |
285285
| 1.19 - 1.20 | 1.15.5 |
286286
| 1.21 - 1.22 | 1.16.7 |
287-
| 1.23+ | 1.17 |
287+
| 1.23 | 1.17 |
288+
| 1.24+ | 1.18 |
288289

289290
##### A Note on Changing Go Versions
290291

sig-testing/charter.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ health of the project.
3434
[peribolos] and [label_sync]
3535
- Tools that facilitate local testing of kubernetes such as [greenhouse]
3636
and [kind]
37-
- Jobs that automate away project toil, such as [periodic jobs that run as
38-
@fejta-bot]
3937
- Ensuring all of the above is kept running on a best effort basis
4038
- Tools, frameworks and libraries that make it possible to write tests against
4139
kubernetes such as e2e\* or integration test frameworks.
@@ -113,7 +111,6 @@ Subprojects are created by Tech Leads following the process defined in [sig-gove
113111
[Kubernetes Charter README]: https://github.com/kubernetes/community/blob/master/committee-steering/governance/README.md
114112
[lazy consensus]: http://en.osswiki.info/concepts/lazy_consensus
115113

116-
[periodic jobs that run as @fejta-bot]: https://git.k8s.io/test-infra/config/jobs/kubernetes/test-infra/fejta-bot-periodics.yaml
117114
[boskos]: https://git.k8s.io/test-infra/boskos
118115
[ghproxy]: https://git.k8s.io/test-infra/ghproxy
119116
[greenhouse]: https://git.k8s.io/test-infra/greenhouse

0 commit comments

Comments
 (0)