Skip to content

Commit 050c9ea

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16615 from soltysh/rebase-1.7.6
Automatic merge from submit-queue. Rebase 1.7.6 @deads2k @liggitt @ironcladlou
2 parents 4650d1d + 911690d commit 050c9ea

File tree

658 files changed

+76735
-15112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

658 files changed

+76735
-15112
lines changed

‎Godeps/Godeps.json

+2,962-2,802
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/docs/api/v1.Pod.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@ $ curl -k \
16711671

16721672
[[Post-api-v1-namespaces-namespace-pods-name-binding]]
16731673
=== Create binding of a Pod in a namespace
1674-
Create binding of a Binding
1674+
Create binding of a Pod
16751675

16761676
==== HTTP request
16771677
----
@@ -1749,7 +1749,7 @@ EOF
17491749

17501750
[[Post-api-v1-namespaces-namespace-pods-name-eviction]]
17511751
=== Create eviction of a Pod in a namespace
1752-
Create eviction of an Eviction
1752+
Create eviction of a Pod
17531753

17541754
==== HTTP request
17551755
----

‎api/docs/api/v1.ReplicationController.adoc

+6-6
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,7 @@ $ curl -k \
15591559

15601560
[[Get-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
15611561
=== Get scale of a ReplicationController in a namespace
1562-
Read scale of the specified Scale
1562+
Read scale of the specified ReplicationController
15631563

15641564
==== HTTP request
15651565
----
@@ -1613,7 +1613,7 @@ $ curl -k \
16131613

16141614
[[Get-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
16151615
=== Get scale of a ReplicationController in a namespace
1616-
Read scale of the specified Scale
1616+
Read scale of the specified ReplicationControllerDummy
16171617

16181618
==== HTTP request
16191619
----
@@ -1667,7 +1667,7 @@ $ curl -k \
16671667

16681668
[[Put-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
16691669
=== Update scale of a ReplicationController in a namespace
1670-
Replace scale of the specified Scale
1670+
Replace scale of the specified ReplicationController
16711671

16721672
==== HTTP request
16731673
----
@@ -1745,7 +1745,7 @@ EOF
17451745

17461746
[[Put-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
17471747
=== Update scale of a ReplicationController in a namespace
1748-
Replace scale of the specified Scale
1748+
Replace scale of the specified ReplicationControllerDummy
17491749

17501750
==== HTTP request
17511751
----
@@ -1823,7 +1823,7 @@ EOF
18231823

18241824
[[Patch-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
18251825
=== Patch scale of a ReplicationController in a namespace
1826-
Partially update scale of the specified Scale
1826+
Partially update scale of the specified ReplicationController
18271827

18281828
==== HTTP request
18291829
----
@@ -1899,7 +1899,7 @@ EOF
18991899

19001900
[[Patch-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
19011901
=== Patch scale of a ReplicationController in a namespace
1902-
Partially update scale of the specified Scale
1902+
Partially update scale of the specified ReplicationControllerDummy
19031903

19041904
==== HTTP request
19051905
----

‎api/docs/apis-apps.openshift.io/v1.DeploymentConfig.adoc

+6-6
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ $ curl -k \
18311831

18321832
[[Post-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-instantiate]]
18331833
=== Create instantiate of a DeploymentConfig in a namespace
1834-
Create instantiate of a DeploymentRequest
1834+
Create instantiate of a DeploymentConfig
18351835

18361836
==== HTTP request
18371837
----
@@ -1909,7 +1909,7 @@ EOF
19091909

19101910
[[Get-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-log]]
19111911
=== Get log of a DeploymentConfig in a namespace
1912-
Read log of the specified DeploymentLog
1912+
Read log of the specified DeploymentConfig
19131913

19141914
==== HTTP request
19151915
----
@@ -1972,7 +1972,7 @@ $ curl -k \
19721972

19731973
[[Post-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-rollback]]
19741974
=== Create rollback of a DeploymentConfig in a namespace
1975-
Create rollback of a DeploymentConfigRollback
1975+
Create rollback of a DeploymentConfig
19761976

19771977
==== HTTP request
19781978
----
@@ -2050,7 +2050,7 @@ EOF
20502050

20512051
[[Get-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
20522052
=== Get scale of a DeploymentConfig in a namespace
2053-
Read scale of the specified Scale
2053+
Read scale of the specified DeploymentConfig
20542054

20552055
==== HTTP request
20562056
----
@@ -2104,7 +2104,7 @@ $ curl -k \
21042104

21052105
[[Put-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
21062106
=== Update scale of a DeploymentConfig in a namespace
2107-
Replace scale of the specified Scale
2107+
Replace scale of the specified DeploymentConfig
21082108

21092109
==== HTTP request
21102110
----
@@ -2182,7 +2182,7 @@ EOF
21822182

21832183
[[Patch-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
21842184
=== Patch scale of a DeploymentConfig in a namespace
2185-
Partially update scale of the specified Scale
2185+
Partially update scale of the specified DeploymentConfig
21862186

21872187
==== HTTP request
21882188
----

‎api/docs/apis-apps/v1beta1.Deployment.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ $ curl -k \
15781578

15791579
[[Post-apis-apps-v1beta1-namespaces-namespace-deployments-name-rollback]]
15801580
=== Create rollback of a Deployment in a namespace
1581-
Create rollback of a DeploymentRollback
1581+
Create rollback of a Deployment
15821582

15831583
==== HTTP request
15841584
----
@@ -1656,7 +1656,7 @@ EOF
16561656

16571657
[[Get-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
16581658
=== Get scale of a Deployment in a namespace
1659-
Read scale of the specified Scale
1659+
Read scale of the specified Deployment
16601660

16611661
==== HTTP request
16621662
----
@@ -1710,7 +1710,7 @@ $ curl -k \
17101710

17111711
[[Put-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
17121712
=== Update scale of a Deployment in a namespace
1713-
Replace scale of the specified Scale
1713+
Replace scale of the specified Deployment
17141714

17151715
==== HTTP request
17161716
----
@@ -1788,7 +1788,7 @@ EOF
17881788

17891789
[[Patch-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
17901790
=== Patch scale of a Deployment in a namespace
1791-
Partially update scale of the specified Scale
1791+
Partially update scale of the specified Deployment
17921792

17931793
==== HTTP request
17941794
----

‎api/docs/apis-build.openshift.io/v1.Build.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ $ curl -k \
12081208

12091209
[[Post-apis-build.openshift.io-v1-namespaces-namespace-builds-name-clone]]
12101210
=== Create clone of a Build in a namespace
1211-
Create clone of a BuildRequest
1211+
Create clone of a Build
12121212

12131213
==== HTTP request
12141214
----
@@ -1364,7 +1364,7 @@ EOF
13641364

13651365
[[Get-apis-build.openshift.io-v1-namespaces-namespace-builds-name-log]]
13661366
=== Get log of a Build in a namespace
1367-
Read log of the specified BuildLog
1367+
Read log of the specified Build
13681368

13691369
==== HTTP request
13701370
----

‎api/docs/apis-build.openshift.io/v1.BuildConfig.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ $ curl -k \
11441144

11451145
[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-instantiate]]
11461146
=== Create instantiate of a BuildConfig in a namespace
1147-
Create instantiate of a BuildRequest
1147+
Create instantiate of a BuildConfig
11481148

11491149
==== HTTP request
11501150
----
@@ -1222,7 +1222,7 @@ EOF
12221222

12231223
[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-instantiatebinary]]
12241224
=== Create instantiatebinary of a BuildConfig in a namespace
1225-
Connect POST requests to instantiatebinary of BinaryBuildRequestOptions
1225+
Connect POST requests to instantiatebinary of BuildConfig
12261226

12271227
==== HTTP request
12281228
----
@@ -1281,7 +1281,7 @@ $ curl -k \
12811281

12821282
[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-webhooks]]
12831283
=== Create webhooks of a BuildConfig in a namespace
1284-
Connect POST requests to webhooks of Build
1284+
Connect POST requests to webhooks of BuildConfig
12851285

12861286
==== HTTP request
12871287
----
@@ -1334,7 +1334,7 @@ $ curl -k \
13341334

13351335
[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-webhooks-path]]
13361336
=== Create webhooks/{path} of a BuildConfig in a namespace
1337-
Connect POST requests to webhooks of Build
1337+
Connect POST requests to webhooks of BuildConfig
13381338

13391339
==== HTTP request
13401340
----

‎api/docs/apis-extensions/v1beta1.Deployment.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ $ curl -k \
15781578

15791579
[[Post-apis-extensions-v1beta1-namespaces-namespace-deployments-name-rollback]]
15801580
=== Create rollback of a Deployment in a namespace
1581-
Create rollback of a DeploymentRollback
1581+
Create rollback of a Deployment
15821582

15831583
==== HTTP request
15841584
----
@@ -1656,7 +1656,7 @@ EOF
16561656

16571657
[[Get-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
16581658
=== Get scale of a Deployment in a namespace
1659-
Read scale of the specified Scale
1659+
Read scale of the specified Deployment
16601660

16611661
==== HTTP request
16621662
----
@@ -1710,7 +1710,7 @@ $ curl -k \
17101710

17111711
[[Put-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
17121712
=== Update scale of a Deployment in a namespace
1713-
Replace scale of the specified Scale
1713+
Replace scale of the specified Deployment
17141714

17151715
==== HTTP request
17161716
----
@@ -1788,7 +1788,7 @@ EOF
17881788

17891789
[[Patch-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
17901790
=== Patch scale of a Deployment in a namespace
1791-
Partially update scale of the specified Scale
1791+
Partially update scale of the specified Deployment
17921792

17931793
==== HTTP request
17941794
----

‎api/docs/apis-extensions/v1beta1.ReplicaSet.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ $ curl -k \
15651565

15661566
[[Get-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
15671567
=== Get scale of a ReplicaSet in a namespace
1568-
Read scale of the specified Scale
1568+
Read scale of the specified ReplicaSet
15691569

15701570
==== HTTP request
15711571
----
@@ -1619,7 +1619,7 @@ $ curl -k \
16191619

16201620
[[Put-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
16211621
=== Update scale of a ReplicaSet in a namespace
1622-
Replace scale of the specified Scale
1622+
Replace scale of the specified ReplicaSet
16231623

16241624
==== HTTP request
16251625
----
@@ -1697,7 +1697,7 @@ EOF
16971697

16981698
[[Patch-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
16991699
=== Patch scale of a ReplicaSet in a namespace
1700-
Partially update scale of the specified Scale
1700+
Partially update scale of the specified ReplicaSet
17011701

17021702
==== HTTP request
17031703
----

‎api/docs/apis-image.openshift.io/v1.ImageStream.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ $ curl -k \
922922

923923
[[Get-apis-image.openshift.io-v1-namespaces-namespace-imagestreams-name-secrets]]
924924
=== Get secrets of a ImageStream in a namespace
925-
Read secrets of the specified SecretList
925+
Read secrets of the specified ImageStream
926926

927927
==== HTTP request
928928
----

‎api/docs/oapi/v1.Build.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ $ curl -k \
12081208

12091209
[[Post-oapi-v1-namespaces-namespace-builds-name-clone]]
12101210
=== Create clone of a Build in a namespace
1211-
Create clone of a BuildRequest
1211+
Create clone of a Build
12121212

12131213
==== HTTP request
12141214
----
@@ -1364,7 +1364,7 @@ EOF
13641364

13651365
[[Get-oapi-v1-namespaces-namespace-builds-name-log]]
13661366
=== Get log of a Build in a namespace
1367-
Read log of the specified BuildLog
1367+
Read log of the specified Build
13681368

13691369
==== HTTP request
13701370
----

‎api/docs/oapi/v1.BuildConfig.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ $ curl -k \
11441144

11451145
[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-instantiate]]
11461146
=== Create instantiate of a BuildConfig in a namespace
1147-
Create instantiate of a BuildRequest
1147+
Create instantiate of a BuildConfig
11481148

11491149
==== HTTP request
11501150
----
@@ -1222,7 +1222,7 @@ EOF
12221222

12231223
[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-instantiatebinary]]
12241224
=== Create instantiatebinary of a BuildConfig in a namespace
1225-
Connect POST requests to instantiatebinary of BinaryBuildRequestOptions
1225+
Connect POST requests to instantiatebinary of BuildConfig
12261226

12271227
==== HTTP request
12281228
----
@@ -1281,7 +1281,7 @@ $ curl -k \
12811281

12821282
[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-webhooks]]
12831283
=== Create webhooks of a BuildConfig in a namespace
1284-
Connect POST requests to webhooks of Build
1284+
Connect POST requests to webhooks of BuildConfig
12851285

12861286
==== HTTP request
12871287
----
@@ -1334,7 +1334,7 @@ $ curl -k \
13341334

13351335
[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-webhooks-path]]
13361336
=== Create webhooks/{path} of a BuildConfig in a namespace
1337-
Connect POST requests to webhooks of Build
1337+
Connect POST requests to webhooks of BuildConfig
13381338

13391339
==== HTTP request
13401340
----

‎api/docs/oapi/v1.DeploymentConfig.adoc

+6-6
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ $ curl -k \
18311831

18321832
[[Post-oapi-v1-namespaces-namespace-deploymentconfigs-name-instantiate]]
18331833
=== Create instantiate of a DeploymentConfig in a namespace
1834-
Create instantiate of a DeploymentRequest
1834+
Create instantiate of a DeploymentConfig
18351835

18361836
==== HTTP request
18371837
----
@@ -1909,7 +1909,7 @@ EOF
19091909

19101910
[[Get-oapi-v1-namespaces-namespace-deploymentconfigs-name-log]]
19111911
=== Get log of a DeploymentConfig in a namespace
1912-
Read log of the specified DeploymentLog
1912+
Read log of the specified DeploymentConfig
19131913

19141914
==== HTTP request
19151915
----
@@ -1972,7 +1972,7 @@ $ curl -k \
19721972

19731973
[[Post-oapi-v1-namespaces-namespace-deploymentconfigs-name-rollback]]
19741974
=== Create rollback of a DeploymentConfig in a namespace
1975-
Create rollback of a DeploymentConfigRollback
1975+
Create rollback of a DeploymentConfig
19761976

19771977
==== HTTP request
19781978
----
@@ -2050,7 +2050,7 @@ EOF
20502050

20512051
[[Get-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
20522052
=== Get scale of a DeploymentConfig in a namespace
2053-
Read scale of the specified Scale
2053+
Read scale of the specified DeploymentConfig
20542054

20552055
==== HTTP request
20562056
----
@@ -2104,7 +2104,7 @@ $ curl -k \
21042104

21052105
[[Put-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
21062106
=== Update scale of a DeploymentConfig in a namespace
2107-
Replace scale of the specified Scale
2107+
Replace scale of the specified DeploymentConfig
21082108

21092109
==== HTTP request
21102110
----
@@ -2182,7 +2182,7 @@ EOF
21822182

21832183
[[Patch-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
21842184
=== Patch scale of a DeploymentConfig in a namespace
2185-
Partially update scale of the specified Scale
2185+
Partially update scale of the specified DeploymentConfig
21862186

21872187
==== HTTP request
21882188
----

0 commit comments

Comments
 (0)