summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2016-01-25 19:51:23 -0800
committerk8s-merge-robot <k8s.production.user@gmail.com>2016-01-25 19:51:23 -0800
commitc969bca3d352ee4fce8e945e510ebe7230ae8022 (patch)
tree74dec335d510b83f824681bf6b5289452ee4ae46
parentb78a52f6541af3eae488a9d5f02ab1f94ce6fbbc (diff)
parent289ab617dc7c71dc2d57e086b19a3fecc926b190 (diff)
Merge pull request #19961 from mamikonyana/newrepo
Auto commit by PR queue bot
-rw-r--r--selinux.md4
-rw-r--r--volumes.md6
2 files changed, 5 insertions, 5 deletions
diff --git a/selinux.md b/selinux.md
index d3b4bfb5..14ce3671 100644
--- a/selinux.md
+++ b/selinux.md
@@ -82,7 +82,7 @@ and allocates a unique MCS label per pod.
### Kubernetes
-There is a [proposed change](https://github.com/GoogleCloudPlatform/kubernetes/pull/9844) to the
+There is a [proposed change](https://github.com/kubernetes/kubernetes/pull/9844) to the
EmptyDir plugin that adds SELinux relabeling capabilities to that plugin, which is also carried as a
patch in [OpenShift](https://github.com/openshift/origin). It is preferable to solve the problem
in general of handling SELinux in kubernetes to merging this PR.
@@ -216,7 +216,7 @@ depends on:
1. Users and groups in Kubernetes
2. General auth policy in Kubernetes
-3. [security policy](https://github.com/GoogleCloudPlatform/kubernetes/pull/7893)
+3. [security policy](https://github.com/kubernetes/kubernetes/pull/7893)
### API changes
diff --git a/volumes.md b/volumes.md
index d00b41cd..059375c4 100644
--- a/volumes.md
+++ b/volumes.md
@@ -152,9 +152,9 @@ created in the volume will inherit the owning GID of the volume.
## Community Design Discussion
-- [kubernetes/2630](https://github.com/GoogleCloudPlatform/kubernetes/issues/2630)
-- [kubernetes/11319](https://github.com/GoogleCloudPlatform/kubernetes/issues/11319)
-- [kubernetes/9384](https://github.com/GoogleCloudPlatform/kubernetes/pull/9384)
+- [kubernetes/2630](https://github.com/kubernetes/kubernetes/issues/2630)
+- [kubernetes/11319](https://github.com/kubernetes/kubernetes/issues/11319)
+- [kubernetes/9384](https://github.com/kubernetes/kubernetes/pull/9384)
## Analysis