Pārlūkot izejas kodu

Sync proto from milvus-proto 2.1 branch

Signed-off-by: yhmo <yihua.mo@zilliz.com>
yhmo 2 gadi atpakaļ
vecāks
revīzija
1fdf6fd426
3 mainītis faili ar 9 papildinājumiem un 2 dzēšanām
  1. 1 0
      .gitmodules
  2. 7 1
      CHANGELOG.md
  3. 1 1
      src/main/milvus-proto

+ 1 - 0
.gitmodules

@@ -1,3 +1,4 @@
 [submodule "src/main/milvus-proto"]
 	path = src/main/milvus-proto
 	url = https://github.com/milvus-io/milvus-proto.git
+	branch = 2.1

+ 7 - 1
CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## milvus-sdk-java 2.1.0 (2022-08-31)
+
+### Bug
+
+- \#367 Fix keepAliveTimeout timeunit error for ConnectParam
+
 ## milvus-sdk-java 2.1.0-beta4 (2022-07-22)
 
 ### Feature
@@ -169,4 +175,4 @@
 - \#21 - Add javadoc
 - \#23 - Format code with Google-java-style and add Apache 2.0 license header
 - \#28 - add examples
-- \#29 - add README
+- \#29 - add README

+ 1 - 1
src/main/milvus-proto

@@ -1 +1 @@
-Subproject commit df5c6a9fd317e0df9d0241f1a9c0715e5d8d2562
+Subproject commit b7aa077b3396118ec7f73ccb6251094765a68962