SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Baxter
2019-09-03 16:18:00 -04:00
parent 388faaa8e5 9c24024bc9
commit d5de0fc55c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/README.adoc
View File

@@ -143,6 +143,9 @@ from the `file` menu.
NOTE: To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
`build.sh` script in the `scripts` directory.
== Contributing
:spring-cloud-build-branch: master

3
docs/src/main/asciidoc/README.adoc
View File

@@ -21,6 +21,9 @@ include::maintenance-mode.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[]
NOTE: To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
`build.sh` script in the `scripts` directory.
== Contributing
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]

8
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesWithCustomFiltersTests.java
View File

@@ -42,11 +42,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Yuxin Bai
*/
@RunWith(SpringRunner.class)
@SpringBootTest(
classes = RefreshablePeerEurekaNodesWithCustomFiltersTests.Application.class,
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
value = { "spring.application.name=eureka", "server.contextPath=/context",
"management.security.enabled=false" })
@SpringBootTest(classes = RefreshablePeerEurekaNodesWithCustomFiltersTests.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, value = {
"spring.application.name=eureka", "server.contextPath=/context",
"management.security.enabled=false" })
public class RefreshablePeerEurekaNodesWithCustomFiltersTests {
@Autowired