Merge pull request #22519 from rutsky/patch-5

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 01:25:42 -08:00
commit 3994e5f725

View File

@ -294,7 +294,7 @@ User deletes the Namespace in Kubernetes, and Namespace now has following state:
"kind": "Namespace", "kind": "Namespace",
"metadata": { "metadata": {
"name": "development", "name": "development",
"deletionTimestamp": "..." "deletionTimestamp": "...",
"labels": { "labels": {
"name": "development" "name": "development"
} }
@ -319,7 +319,7 @@ removing *kubernetes* from the list of finalizers:
"kind": "Namespace", "kind": "Namespace",
"metadata": { "metadata": {
"name": "development", "name": "development",
"deletionTimestamp": "..." "deletionTimestamp": "...",
"labels": { "labels": {
"name": "development" "name": "development"
} }
@ -347,7 +347,7 @@ This results in the following state:
"kind": "Namespace", "kind": "Namespace",
"metadata": { "metadata": {
"name": "development", "name": "development",
"deletionTimestamp": "..." "deletionTimestamp": "...",
"labels": { "labels": {
"name": "development" "name": "development"
} }