Skip to content

5.0.0 dev#208

Merged
xlorne merged 136 commits intomasterfrom
5.0.0-dev
Jan 20, 2019
Merged

5.0.0 dev#208
xlorne merged 136 commits intomasterfrom
5.0.0-dev

Conversation

@xlorne
Copy link
Copy Markdown
Contributor

@xlorne xlorne commented Jan 20, 2019

No description provided.

ujued and others added 30 commits January 15, 2019 13:48
…5.0.0-dev

# Conflicts:
#	tx-manager/src/main/resources/application-ujued.properties
…5.0.0-dev

# Conflicts:
#	tx-spi-message-netty/src/main/java/com/codingapi/txlcn/spi/message/netty/RpcNettyConfiguration.java
…5.0.0-dev

# Conflicts:
#	tx-spi-message-netty/src/main/java/com/codingapi/txlcn/spi/message/netty/RpcNettyConfiguration.java
ujued and others added 29 commits January 18, 2019 18:04
…5.0.0-dev

# Conflicts:
#	tx-client/src/main/java/com/codingapi/txlcn/client/message/init/TxClientClientInitCallBack.java
# Conflicts:
#	tx-spi-message-netty/src/main/java/com/codingapi/txlcn/spi/message/netty/impl/NettyRpcClientInitializer.java
@xlorne xlorne merged commit 9f5f109 into master Jan 20, 2019
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.

3 participants