Skip to content

Commit

Permalink
Merge branch '4.9.x'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	CHANGELOG.md
#	README.md
#	extensions/knative/client/pom.xml
#	extensions/knative/examples/pom.xml
#	extensions/knative/mock/pom.xml
#	extensions/knative/model/pom.xml
#	extensions/knative/pom.xml
#	extensions/knative/tests/pom.xml
#	extensions/pom.xml
#	extensions/service-catalog/client/pom.xml
#	extensions/service-catalog/examples/pom.xml
#	extensions/service-catalog/mock/pom.xml
#	extensions/service-catalog/model/pom.xml
#	extensions/service-catalog/model/servicecatalog-model-annotator/pom.xml
#	extensions/service-catalog/pom.xml
#	extensions/service-catalog/tests/pom.xml
#	extensions/tekton/annotator/pom.xml
#	extensions/tekton/client/pom.xml
#	extensions/tekton/examples/pom.xml
#	extensions/tekton/mock/pom.xml
#	extensions/tekton/model-v1alpha1/pom.xml
#	extensions/tekton/pom.xml
#	extensions/tekton/tests/pom.xml
#	kubernetes-client/pom.xml
#	kubernetes-examples/pom.xml
#	kubernetes-itests/pom.xml
#	kubernetes-model/kubernetes-model-annotator/pom.xml
#	kubernetes-model/kubernetes-model-autoscaling/pom.xml
#	kubernetes-model/kubernetes-model-common/pom.xml
#	kubernetes-model/kubernetes-model/pom.xml
#	kubernetes-model/model-generator-app/pom.xml
#	kubernetes-model/pom.xml
#	kubernetes-server-mock/pom.xml
#	kubernetes-tests/pom.xml
#	model-annotator/pom.xml
#	openshift-client/pom.xml
#	openshift-server-mock/pom.xml
#	platforms/karaf/features/pom.xml
#	platforms/karaf/itests/pom.xml
#	platforms/karaf/pom.xml
#	platforms/pom.xml
#	pom.xml
#	uberjar/pom.xml
  • Loading branch information
@manusa
manusa committed May 19, 2020
2 parents 80843e3 + bb208da commit c96b1db
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@
* Fix #2002: DSL Support for PodTemplate
* Fix #2015: Add Support for v1, v2beta1, and v2beta2 apiVersions in case of HorizontalPodAutoscaler

### 4.9.2 (2020-05-19)
#### Bugs
* Fix #2212: JDK8 always uses http/1.1 protocol (Prevent OkHttp from wrongly enabling http/2)

#### Improvements

#### Dependency Upgrade

#### New Features

### 4.9.1 (2020-04-17)
#### Bugs
* Fix #2071: Fixed pvc example issue #2071
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Kubernetes & OpenShift Java Client [![Join the chat at https://gitter.im/fabric8io/kubernetes-client](https://badges.gitter.im/fabric8io/kubernetes-client.svg)](https://gitter.im/fabric8io/kubernetes-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
This client provides access to the full [Kubernetes](http://kubernetes.io/) &
[OpenShift](http://openshift.org/) REST APIs via a fluent DSL.
Expand Down Expand Up @@ -384,6 +383,7 @@ Then you can use the server like:
| kubernetes-client 4.8.0 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| kubernetes-client 4.9.0 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| kubernetes-client 4.9.1 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| kubernetes-client 4.9.2 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| kubernetes-client 4.10.0 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| kubernetes-client 4.10.1 | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |

Expand Down Expand Up @@ -421,6 +421,7 @@ Then you can use the server like:
| openshift-client 4.8.0 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |
| openshift-client 4.9.0 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |
| openshift-client 4.9.1 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |
| openshift-client 4.9.2 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |
| openshift-client 4.10.0 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |
| openshift-client 4.10.1 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |

Expand Down

0 comments on commit c96b1db

Please sign in to comment.