Skip to content

Conversation

@akoshibe
Copy link

Cherry-pick of e56c7f1 (upstream)

Conflicts:
core/src/main/java/net/kuujo/copycat/resource/internal/PassiveState.java
netty/src/main/java/net/kuujo/copycat/netty/NettyTcpProtocolClient.java
netty/src/main/java/net/kuujo/copycat/netty/NettyTcpProtocolServer.java
test-tools/src/main/java/net/kuujo/copycat/test/ProtocolTest.java
test-tools/src/main/java/net/kuujo/copycat/test/TestCluster.java

Conflicts:
	core/src/main/java/net/kuujo/copycat/resource/internal/PassiveState.java
	netty/src/main/java/net/kuujo/copycat/netty/NettyTcpProtocolClient.java
	netty/src/main/java/net/kuujo/copycat/netty/NettyTcpProtocolServer.java
	test-tools/src/main/java/net/kuujo/copycat/test/ProtocolTest.java
	test-tools/src/main/java/net/kuujo/copycat/test/TestCluster.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants