Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Spencer Gibb
2019-04-01 12:52:55 -04:00
8 changed files with 323 additions and 187 deletions

View File

@@ -83,7 +83,7 @@ public class CloudFoundryDiscoveryClientTest {
ApplicationDetail applicationDetail = ApplicationDetail.builder().instances(2)
.name("my-app").stack("stack").memoryLimit(1024).id("id")
.requestedState("requestedState").runningInstances(2)
.url("http://my-app.cfapps.io").diskQuota(20).build();
.url("http://my-app-cfapps-io").diskQuota(20).build();
InstanceDetail instanceDetail = InstanceDetail.builder().index("0").build();
Tuple2<ApplicationDetail, InstanceDetail> tuple2 = Tuples.of(applicationDetail,
instanceDetail);