Review conflicts from 1.6-release/master merges

2017-04-20 10:46:59 -07:00
parent 800f1b588d
commit cb9cff59db
5 changed files with 3 additions and 69 deletions
@@ -24,12 +24,6 @@ due to a node hardware failure or a node reboot).

 A Job can also be used to run multiple pods in parallel.

-### extensions/v1beta1.Job is deprecated
-
-Starting from version 1.5 `extensions/v1beta1.Job` is being deprecated, with a plan to be removed in
-version 1.6 of Kubernetes (see this [issue](https://github.com/kubernetes/kubernetes/issues/32763)).
-Please use `batch/v1.Job` instead.
-
 ## Running an example Job

 Here is an example Job config.  It computes π to 2000 places and prints it out.