Commit b616dcb7 authored by JinHai-CN's avatar JinHai-CN
Browse files

Update branch 



Signed-off-by: default avatarJinHai-CN <hai.jin@zilliz.com>
parent 014a0e86

CHANGELOG.md

+2 −2
Original line number Diff line number Diff line 
# Changelog



Please mark all change in change log and use the issue from GitHub

# Milvus 0.9.1 (TBD)

# Milvus 0.10.0 (TBD)



## Bug



## Feature

-   \#2363 Update branch version to 0.9.1

-   \#2363 Update branch version



## Improvement

-   \#2370 Clean compile warning

ci/jenkins/Jenkinsfile

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env groovy



String cron_timezone = "TZ=Asia/Shanghai"

String cron_string = BRANCH_NAME == "0.9.1" ? "38 1 * * * " : ""

String cron_string = BRANCH_NAME == "0.10.0" ? "38 1 * * * " : ""



pipeline {

    agent none

core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ if (MILVUS_VERSION_MAJOR STREQUAL "" 
        OR MILVUS_VERSION_MINOR STREQUAL ""

        OR MILVUS_VERSION_PATCH STREQUAL "")

    message(WARNING "Failed to determine Milvus version from git branch name")

    set(MILVUS_VERSION "0.9.1")

    set(MILVUS_VERSION "0.10.0")

endif ()



message(STATUS "Build version = ${MILVUS_VERSION}")

core/src/config/Config.cpp

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ constexpr int32_t PORT_NUMBER_MIN = 1024; 
constexpr int32_t PORT_NUMBER_MAX = 65535;



static const std::unordered_map<std::string, std::string> milvus_config_version_map(

    {{"0.6.0", "0.1"}, {"0.7.0", "0.2"}, {"0.7.1", "0.2"}, {"0.8.0", "0.3"}, {"0.9.0", "0.4"}, {"0.9.1", "0.4"}});

    {{"0.6.0", "0.1"}, {"0.7.0", "0.2"}, {"0.7.1", "0.2"}, {"0.8.0", "0.3"}, {"0.9.0", "0.4"}, {"0.10.0", "0.4"}});



/////////////////////////////////////////////////////////////

Config::Config() {

sdk/grpc/ClientProxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include "grpc-gen/gen-milvus/milvus.grpc.pb.h"



#define MILVUS_SDK_VERSION "0.9.0";

#define MILVUS_SDK_VERSION "0.10.0";



namespace milvus {