Support for using OpenFeign in Spring Cloud apps
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Spencer Gibb
b0dccc0f81
Merge branch 'master' into 2.0.x
# Conflicts:
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/DefaultMetricsTagProvider.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/DeferredResultSubscriber.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/ResponseBodyEmitterSubscriber.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxResponse.java
# spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RibbonCommandContextTest.java
# spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/rx/ObservableReturnValueHandlerTests.java
# spring-cloud-netflix-dependencies/pom.xml
|
7 years ago |
| .. |
|
src
|
Merge branch 'master' into 2.0.x
|
7 years ago |
|
pom.xml
|
…
|
|
|
run-server.sh
|
…
|
|
