From f831f3cf3b9f68c5d02ec183df669d0141e947e8 Mon Sep 17 00:00:00 2001 From: JinHai-CN Date: Sat, 7 Dec 2019 16:18:17 +0800 Subject: [PATCH 1/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb594dc44f..0fe889af79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog Please mark all change in change log and use the ticket from JIRA. -# Milvus 0.6.0 (TODO) +# Milvus 0.6.0 (2019-12-07) ## Bug - \#228 - memory usage increased slowly during searching vectors From c11a4c594e875c18c87008041a8513a074745ad8 Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Sat, 7 Dec 2019 17:00:21 +0800 Subject: [PATCH 2/2] #709 handle the case when git fail to get last commit id (#723) --- core/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 0b02109bf4..760a32fdb3 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -69,10 +69,11 @@ GET_LAST_COMMIT_ID(LAST_COMMIT_ID) message(STATUS "LAST_COMMIT_ID = ${LAST_COMMIT_ID}") if (NOT LAST_COMMIT_ID STREQUAL "") string(REGEX REPLACE "\n" "" LAST_COMMIT_ID ${LAST_COMMIT_ID}) + set(LAST_COMMIT_ID "${LAST_COMMIT_ID}") +else () + set(LAST_COMMIT_ID "Unknown") endif () -set(LAST_COMMIT_ID "${LAST_COMMIT_ID}") - # set build type if (CMAKE_BUILD_TYPE STREQUAL "Release") set(BUILD_TYPE "Release")