Ryan Baxter 2bf7f62e8c Merge remote-tracking branch 'origin/1.1.x' ...

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-kubernetes-config/pom.xml
#	spring-cloud-kubernetes-core/pom.xml
#	spring-cloud-kubernetes-dependencies/pom.xml
#	spring-cloud-kubernetes-discovery/pom.xml
#	spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
#	spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
#	spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
#	spring-cloud-kubernetes-examples/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
#	spring-cloud-kubernetes-integration-tests/istio/pom.xml
#	spring-cloud-kubernetes-integration-tests/pom.xml
#	spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
#	spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
#	spring-cloud-kubernetes-istio/pom.xml
#	spring-cloud-kubernetes-leader/pom.xml
#	spring-cloud-starter-kubernetes-all/pom.xml
#	spring-cloud-starter-kubernetes-config/pom.xml
#	spring-cloud-starter-kubernetes/pom.xml

2020-06-23 10:12:30 -04:00

..

src/main/asciidoc

Merge remote-tracking branch 'origin/1.1.x'

2020-06-23 10:12:30 -04:00

pom.xml

Changed packaging to jar

2020-06-08 17:12:01 +02:00