Merge pull request #16615 from soltysh/rebase-1.7.6

Automatic merge from submit-queue. Rebase 1.7.6 @deads2k @liggitt @ironcladlou
openshift · Oct 5, 2017 · 050c9ea · 050c9ea
2 parents 4650d1d + 911690d
commit 050c9ea
Show file tree

Hide file tree

Showing 658 changed files with 76,735 additions and 15,112 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/api/docs/api/v1.Pod.adoc b/api/docs/api/v1.Pod.adoc
@@ -1671,7 +1671,7 @@ $ curl -k \
 
 [[Post-api-v1-namespaces-namespace-pods-name-binding]]
 === Create binding of a Pod in a namespace
-Create binding of a Binding
+Create binding of a Pod
 
 ==== HTTP request
 ----
@@ -1749,7 +1749,7 @@ EOF
 
 [[Post-api-v1-namespaces-namespace-pods-name-eviction]]
 === Create eviction of a Pod in a namespace
-Create eviction of an Eviction
+Create eviction of a Pod
 
 ==== HTTP request
 ----

diff --git a/api/docs/api/v1.ReplicationController.adoc b/api/docs/api/v1.ReplicationController.adoc
@@ -1559,7 +1559,7 @@ $ curl -k \
 
 [[Get-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
 === Get scale of a ReplicationController in a namespace
-Read scale of the specified Scale
+Read scale of the specified ReplicationController
 
 ==== HTTP request
 ----
@@ -1613,7 +1613,7 @@ $ curl -k \
 
 [[Get-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
 === Get scale of a ReplicationController in a namespace
-Read scale of the specified Scale
+Read scale of the specified ReplicationControllerDummy
 
 ==== HTTP request
 ----
@@ -1667,7 +1667,7 @@ $ curl -k \
 
 [[Put-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
 === Update scale of a ReplicationController in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified ReplicationController
 
 ==== HTTP request
 ----
@@ -1745,7 +1745,7 @@ EOF
 
 [[Put-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
 === Update scale of a ReplicationController in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified ReplicationControllerDummy
 
 ==== HTTP request
 ----
@@ -1823,7 +1823,7 @@ EOF
 
 [[Patch-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
 === Patch scale of a ReplicationController in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified ReplicationController
 
 ==== HTTP request
 ----
@@ -1899,7 +1899,7 @@ EOF
 
 [[Patch-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
 === Patch scale of a ReplicationController in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified ReplicationControllerDummy
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-apps.openshift.io/v1.DeploymentConfig.adoc b/api/docs/apis-apps.openshift.io/v1.DeploymentConfig.adoc
@@ -1831,7 +1831,7 @@ $ curl -k \
 
 [[Post-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-instantiate]]
 === Create instantiate of a DeploymentConfig in a namespace
-Create instantiate of a DeploymentRequest
+Create instantiate of a DeploymentConfig
 
 ==== HTTP request
 ----
@@ -1909,7 +1909,7 @@ EOF
 
 [[Get-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-log]]
 === Get log of a DeploymentConfig in a namespace
-Read log of the specified DeploymentLog
+Read log of the specified DeploymentConfig
 
 ==== HTTP request
 ----
@@ -1972,7 +1972,7 @@ $ curl -k \
 
 [[Post-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-rollback]]
 === Create rollback of a DeploymentConfig in a namespace
-Create rollback of a DeploymentConfigRollback
+Create rollback of a DeploymentConfig
 
 ==== HTTP request
 ----
@@ -2050,7 +2050,7 @@ EOF
 
 [[Get-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
 === Get scale of a DeploymentConfig in a namespace
-Read scale of the specified Scale
+Read scale of the specified DeploymentConfig
 
 ==== HTTP request
 ----
@@ -2104,7 +2104,7 @@ $ curl -k \
 
 [[Put-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
 === Update scale of a DeploymentConfig in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified DeploymentConfig
 
 ==== HTTP request
 ----
@@ -2182,7 +2182,7 @@ EOF
 
 [[Patch-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
 === Patch scale of a DeploymentConfig in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified DeploymentConfig
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-apps/v1beta1.Deployment.adoc b/api/docs/apis-apps/v1beta1.Deployment.adoc
@@ -1578,7 +1578,7 @@ $ curl -k \
 
 [[Post-apis-apps-v1beta1-namespaces-namespace-deployments-name-rollback]]
 === Create rollback of a Deployment in a namespace
-Create rollback of a DeploymentRollback
+Create rollback of a Deployment
 
 ==== HTTP request
 ----
@@ -1656,7 +1656,7 @@ EOF
 
 [[Get-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
 === Get scale of a Deployment in a namespace
-Read scale of the specified Scale
+Read scale of the specified Deployment
 
 ==== HTTP request
 ----
@@ -1710,7 +1710,7 @@ $ curl -k \
 
 [[Put-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
 === Update scale of a Deployment in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified Deployment
 
 ==== HTTP request
 ----
@@ -1788,7 +1788,7 @@ EOF
 
 [[Patch-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
 === Patch scale of a Deployment in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified Deployment
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-build.openshift.io/v1.Build.adoc b/api/docs/apis-build.openshift.io/v1.Build.adoc
@@ -1208,7 +1208,7 @@ $ curl -k \
 
 [[Post-apis-build.openshift.io-v1-namespaces-namespace-builds-name-clone]]
 === Create clone of a Build in a namespace
-Create clone of a BuildRequest
+Create clone of a Build
 
 ==== HTTP request
 ----
@@ -1364,7 +1364,7 @@ EOF
 
 [[Get-apis-build.openshift.io-v1-namespaces-namespace-builds-name-log]]
 === Get log of a Build in a namespace
-Read log of the specified BuildLog
+Read log of the specified Build
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-build.openshift.io/v1.BuildConfig.adoc b/api/docs/apis-build.openshift.io/v1.BuildConfig.adoc
@@ -1144,7 +1144,7 @@ $ curl -k \
 
 [[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-instantiate]]
 === Create instantiate of a BuildConfig in a namespace
-Create instantiate of a BuildRequest
+Create instantiate of a BuildConfig
 
 ==== HTTP request
 ----
@@ -1222,7 +1222,7 @@ EOF
 
 [[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-instantiatebinary]]
 === Create instantiatebinary of a BuildConfig in a namespace
-Connect POST requests to instantiatebinary of BinaryBuildRequestOptions
+Connect POST requests to instantiatebinary of BuildConfig
 
 ==== HTTP request
 ----
@@ -1281,7 +1281,7 @@ $ curl -k \
 
 [[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-webhooks]]
 === Create webhooks of a BuildConfig in a namespace
-Connect POST requests to webhooks of Build
+Connect POST requests to webhooks of BuildConfig
 
 ==== HTTP request
 ----
@@ -1334,7 +1334,7 @@ $ curl -k \
 
 [[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-webhooks-path]]
 === Create webhooks/{path} of a BuildConfig in a namespace
-Connect POST requests to webhooks of Build
+Connect POST requests to webhooks of BuildConfig
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-extensions/v1beta1.Deployment.adoc b/api/docs/apis-extensions/v1beta1.Deployment.adoc
@@ -1578,7 +1578,7 @@ $ curl -k \
 
 [[Post-apis-extensions-v1beta1-namespaces-namespace-deployments-name-rollback]]
 === Create rollback of a Deployment in a namespace
-Create rollback of a DeploymentRollback
+Create rollback of a Deployment
 
 ==== HTTP request
 ----
@@ -1656,7 +1656,7 @@ EOF
 
 [[Get-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
 === Get scale of a Deployment in a namespace
-Read scale of the specified Scale
+Read scale of the specified Deployment
 
 ==== HTTP request
 ----
@@ -1710,7 +1710,7 @@ $ curl -k \
 
 [[Put-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
 === Update scale of a Deployment in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified Deployment
 
 ==== HTTP request
 ----
@@ -1788,7 +1788,7 @@ EOF
 
 [[Patch-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
 === Patch scale of a Deployment in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified Deployment
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-extensions/v1beta1.ReplicaSet.adoc b/api/docs/apis-extensions/v1beta1.ReplicaSet.adoc
@@ -1565,7 +1565,7 @@ $ curl -k \
 
 [[Get-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
 === Get scale of a ReplicaSet in a namespace
-Read scale of the specified Scale
+Read scale of the specified ReplicaSet
 
 ==== HTTP request
 ----
@@ -1619,7 +1619,7 @@ $ curl -k \
 
 [[Put-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
 === Update scale of a ReplicaSet in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified ReplicaSet
 
 ==== HTTP request
 ----
@@ -1697,7 +1697,7 @@ EOF
 
 [[Patch-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
 === Patch scale of a ReplicaSet in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified ReplicaSet
 
 ==== HTTP request
 ----

diff --git a/api/docs/apis-image.openshift.io/v1.ImageStream.adoc b/api/docs/apis-image.openshift.io/v1.ImageStream.adoc
@@ -922,7 +922,7 @@ $ curl -k \
 
 [[Get-apis-image.openshift.io-v1-namespaces-namespace-imagestreams-name-secrets]]
 === Get secrets of a ImageStream in a namespace
-Read secrets of the specified SecretList
+Read secrets of the specified ImageStream
 
 ==== HTTP request
 ----

diff --git a/api/docs/oapi/v1.Build.adoc b/api/docs/oapi/v1.Build.adoc
@@ -1208,7 +1208,7 @@ $ curl -k \
 
 [[Post-oapi-v1-namespaces-namespace-builds-name-clone]]
 === Create clone of a Build in a namespace
-Create clone of a BuildRequest
+Create clone of a Build
 
 ==== HTTP request
 ----
@@ -1364,7 +1364,7 @@ EOF
 
 [[Get-oapi-v1-namespaces-namespace-builds-name-log]]
 === Get log of a Build in a namespace
-Read log of the specified BuildLog
+Read log of the specified Build
 
 ==== HTTP request
 ----

diff --git a/api/docs/oapi/v1.BuildConfig.adoc b/api/docs/oapi/v1.BuildConfig.adoc
@@ -1144,7 +1144,7 @@ $ curl -k \
 
 [[Post-oapi-v1-namespaces-namespace-buildconfigs-name-instantiate]]
 === Create instantiate of a BuildConfig in a namespace
-Create instantiate of a BuildRequest
+Create instantiate of a BuildConfig
 
 ==== HTTP request
 ----
@@ -1222,7 +1222,7 @@ EOF
 
 [[Post-oapi-v1-namespaces-namespace-buildconfigs-name-instantiatebinary]]
 === Create instantiatebinary of a BuildConfig in a namespace
-Connect POST requests to instantiatebinary of BinaryBuildRequestOptions
+Connect POST requests to instantiatebinary of BuildConfig
 
 ==== HTTP request
 ----
@@ -1281,7 +1281,7 @@ $ curl -k \
 
 [[Post-oapi-v1-namespaces-namespace-buildconfigs-name-webhooks]]
 === Create webhooks of a BuildConfig in a namespace
-Connect POST requests to webhooks of Build
+Connect POST requests to webhooks of BuildConfig
 
 ==== HTTP request
 ----
@@ -1334,7 +1334,7 @@ $ curl -k \
 
 [[Post-oapi-v1-namespaces-namespace-buildconfigs-name-webhooks-path]]
 === Create webhooks/{path} of a BuildConfig in a namespace
-Connect POST requests to webhooks of Build
+Connect POST requests to webhooks of BuildConfig
 
 ==== HTTP request
 ----

diff --git a/api/docs/oapi/v1.DeploymentConfig.adoc b/api/docs/oapi/v1.DeploymentConfig.adoc
@@ -1831,7 +1831,7 @@ $ curl -k \
 
 [[Post-oapi-v1-namespaces-namespace-deploymentconfigs-name-instantiate]]
 === Create instantiate of a DeploymentConfig in a namespace
-Create instantiate of a DeploymentRequest
+Create instantiate of a DeploymentConfig
 
 ==== HTTP request
 ----
@@ -1909,7 +1909,7 @@ EOF
 
 [[Get-oapi-v1-namespaces-namespace-deploymentconfigs-name-log]]
 === Get log of a DeploymentConfig in a namespace
-Read log of the specified DeploymentLog
+Read log of the specified DeploymentConfig
 
 ==== HTTP request
 ----
@@ -1972,7 +1972,7 @@ $ curl -k \
 
 [[Post-oapi-v1-namespaces-namespace-deploymentconfigs-name-rollback]]
 === Create rollback of a DeploymentConfig in a namespace
-Create rollback of a DeploymentConfigRollback
+Create rollback of a DeploymentConfig
 
 ==== HTTP request
 ----
@@ -2050,7 +2050,7 @@ EOF
 
 [[Get-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
 === Get scale of a DeploymentConfig in a namespace
-Read scale of the specified Scale
+Read scale of the specified DeploymentConfig
 
 ==== HTTP request
 ----
@@ -2104,7 +2104,7 @@ $ curl -k \
 
 [[Put-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
 === Update scale of a DeploymentConfig in a namespace
-Replace scale of the specified Scale
+Replace scale of the specified DeploymentConfig
 
 ==== HTTP request
 ----
@@ -2182,7 +2182,7 @@ EOF
 
 [[Patch-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
 === Patch scale of a DeploymentConfig in a namespace
-Partially update scale of the specified Scale
+Partially update scale of the specified DeploymentConfig
 
 ==== HTTP request
 ----