Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/HostInferenceLoggerPrinter.java
#	register/src/main/java/com/webank/ai/fate/register/common/CuratorZookeeperClient.java
#	router/src/main/java/com/webank/ai/fate/networking/Proxy.java
#	router/src/main/java/com/webank/ai/fate/networking/proxy/grpc/client/DataTransferPipedClient.java
#	serving-server/src/main/java/com/webank/ai/fate/serving/service/ModelService.java
  • Loading branch information
huttuh committed Feb 21, 2020
2 parents 3dcdfdd + 9d0347d commit 1dc25d4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 1dc25d4

Please sign in to comment.