Merge pull request #12518 from soltysh/cronjob_leftovers

Merged by openshift-bot
openshift · Jan 17, 2017 · f136dff · f136dff
2 parents 8c82e8f + ab38c71
commit f136dff
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docs/man/man1/oc-run.1 b/docs/man/man1/oc-run.1
@@ -117,7 +117,7 @@ Creates a deployment config to manage the created container(s). You can choose t
 
 .PP
 \fB\-\-restart\fP="Always"
-    The restart policy for this Pod.  Legal values [Always, OnFailure, Never].  If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two \-\-replicas must be 1.  Default 'Always', for ScheduledJobs \fB\fCNever\fR.
+    The restart policy for this Pod.  Legal values [Always, OnFailure, Never].  If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two \-\-replicas must be 1.  Default 'Always', for CronJobs \fB\fCNever\fR.
 
 .PP
 \fB\-\-rm\fP=false

diff --git a/docs/man/man1/openshift-cli-run.1 b/docs/man/man1/openshift-cli-run.1
@@ -117,7 +117,7 @@ Creates a deployment config to manage the created container(s). You can choose t
 
 .PP
 \fB\-\-restart\fP="Always"
-    The restart policy for this Pod.  Legal values [Always, OnFailure, Never].  If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two \-\-replicas must be 1.  Default 'Always', for ScheduledJobs \fB\fCNever\fR.
+    The restart policy for this Pod.  Legal values [Always, OnFailure, Never].  If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two \-\-replicas must be 1.  Default 'Always', for CronJobs \fB\fCNever\fR.
 
 .PP
 \fB\-\-rm\fP=false

diff --git a/docs/man/man1/openshift-kube-run.1 b/docs/man/man1/openshift-kube-run.1
@@ -118,7 +118,7 @@ Creates a deployment or job to manage the created container(s).
 
 .PP
 \fB\-\-restart\fP="Always"
-    The restart policy for this Pod.  Legal values [Always, OnFailure, Never].  If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two \-\-replicas must be 1.  Default 'Always', for ScheduledJobs \fB\fCNever\fR.
+    The restart policy for this Pod.  Legal values [Always, OnFailure, Never].  If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two \-\-replicas must be 1.  Default 'Always', for CronJobs \fB\fCNever\fR.
 
 .PP
 \fB\-\-rm\fP=false

diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/run.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/run.go
diff --git a/vendor/k8s.io/kubernetes/pkg/registry/batch/cronjob/doc.go b/vendor/k8s.io/kubernetes/pkg/registry/batch/cronjob/doc.go