summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-09-06 14:16:08 -0700
committerGitHub <noreply@github.com>2018-09-06 14:16:08 -0700
commit6d4f64c4b6df9725b54524f2286d6c628032f487 (patch)
tree924771801cf6d51b08511f90e92e727bdbf6ede6
parentfd71278e449be1b75d40092f2646768e54878aa2 (diff)
parent79279adbb2a15f67db80a4ef97a4f22390f480c9 (diff)
Merge pull request #2577 from lavalamp/smd
Add repo for serverside apply test cases & code
-rw-r--r--sig-api-machinery/README.md3
-rw-r--r--sigs.yaml3
2 files changed, 4 insertions, 2 deletions
diff --git a/sig-api-machinery/README.md b/sig-api-machinery/README.md
index 4773c299..35a32ec7 100644
--- a/sig-api-machinery/README.md
+++ b/sig-api-machinery/README.md
@@ -78,6 +78,7 @@ The following subprojects are owned by sig-api-machinery:
- https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/code-generator/OWNERS
- https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
- https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
+ - https://raw.githubusercontent.com/kubernetes-sigs/structured-merge-diff/master/OWNERS
- **kubernetes-clients**
- Owners:
- https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS
@@ -99,7 +100,7 @@ Note that the links to display team membership will only work if you are a membe
| Team Name | Details | Description |
| --------- |:-------:| ----------- |
-| @kubernetes/sig-api-machinery-api-reviews | [link](https://github.com/orgs/kubernetes/teams/sig-api-machinery-api-reviews) | API Changes and Reviews |
+| @kubernetes/sig-api-machinery-api-reviews | [link](https://github.com/orgs/kubernetes/teams/sig-api-machinery-api-reviews) | API Changes and Reviews (API Machinery APIs, NOT all APIs) |
| @kubernetes/sig-api-machinery-bugs | [link](https://github.com/orgs/kubernetes/teams/sig-api-machinery-bugs) | Bug Triage and Troubleshooting |
| @kubernetes/sig-api-machinery-feature-requests | [link](https://github.com/orgs/kubernetes/teams/sig-api-machinery-feature-requests) | Feature Requests |
| @kubernetes/sig-api-machinery-misc | [link](https://github.com/orgs/kubernetes/teams/sig-api-machinery-misc) | General Discussion |
diff --git a/sigs.yaml b/sigs.yaml
index 174afa28..c5ed3d37 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -30,7 +30,7 @@ sigs:
mailing_list: https://groups.google.com/forum/#!forum/kubernetes-sig-api-machinery
teams:
- name: sig-api-machinery-api-reviews
- description: API Changes and Reviews
+ description: API Changes and Reviews (API Machinery APIs, NOT all APIs)
- name: sig-api-machinery-bugs
description: Bug Triage and Troubleshooting
- name: sig-api-machinery-feature-requests
@@ -91,6 +91,7 @@ sigs:
- https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/code-generator/OWNERS
- https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
- https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
+ - https://raw.githubusercontent.com/kubernetes-sigs/structured-merge-diff/master/OWNERS
- name: kubernetes-clients
owners:
- https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS