Merge tag '1.6.0' into develop

kbahr · kbahr · commit bc51c98d93e8 · 2019-04-01T11:31:16.000-07:00
1.6.0 Release
diff --git a/proteus-client/src/main/java/io/netifi/proteus/rsocket/WeightedReconnectingRSocket.java b/proteus-client/src/main/java/io/netifi/proteus/rsocket/WeightedReconnectingRSocket.java
@@ -205,7 +205,7 @@ private ClientRSocketFactory getClientFactory() {
     } else {
       connect
           .keepAlive()
-          .keepAliveAckTimeout(Duration.ofSeconds(0))
+          .keepAliveTickPeriod(Duration.ofSeconds(0))
           .keepAliveAckTimeout(Duration.ofSeconds(0))
           .keepAliveMissedAcks(missedAcks);
     }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ private ClientRSocketFactory getClientFactory() {`
`205`	`205`	`} else {`
`206`	`206`	`connect`
`207`	`207`	`.keepAlive()`
`208`		`- .keepAliveAckTimeout(Duration.ofSeconds(0))`
	`208`	`+ .keepAliveTickPeriod(Duration.ofSeconds(0))`
`209`	`209`	`.keepAliveAckTimeout(Duration.ofSeconds(0))`
`210`	`210`	`.keepAliveMissedAcks(missedAcks);`
`211`	`211`	`}`