Merge branch '4.1.x' into 4.2.x
This commit is contained in:
@@ -27,7 +27,7 @@ import org.springframework.cloud.commons.util.UtilAutoConfiguration;
|
||||
import org.springframework.cloud.consul.ConsulAutoConfiguration;
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
|
||||
import static org.junit.Assert.fail;
|
||||
import static org.assertj.core.api.Fail.fail;
|
||||
|
||||
/**
|
||||
* @author Olga Maciaszek-Sharma
|
||||
|
||||
Reference in New Issue
Block a user