From c69a6dfe9bd912892eb22dfddaa9101434e3ef8e Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Mon, 2 Sep 2024 07:29:03 -0600 Subject: [PATCH 1/3] build: bump to v3.2 series Signed-off-by: Eduardo Silva --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2e9fbf3b04..9e42d4faffc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # Fluent Bit Version set(FLB_VERSION_MAJOR 3) -set(FLB_VERSION_MINOR 1) -set(FLB_VERSION_PATCH 7) +set(FLB_VERSION_MINOR 2) +set(FLB_VERSION_PATCH 0) set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}") set(CMAKE_POSITION_INDEPENDENT_CODE ON) From 6a54ee5657bb8af5388dacb17a5279a042692cb8 Mon Sep 17 00:00:00 2001 From: Leonardo Alminana Date: Tue, 3 Sep 2024 11:45:15 +0200 Subject: [PATCH 2/3] input: added missing initializer Signed-off-by: Leonardo Alminana --- include/fluent-bit/flb_input.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/fluent-bit/flb_input.h b/include/fluent-bit/flb_input.h index 9140b1dc71f..0b69f8cca9a 100644 --- a/include/fluent-bit/flb_input.h +++ b/include/fluent-bit/flb_input.h @@ -627,6 +627,8 @@ static inline int flb_input_config_map_set(struct flb_input_instance *ins, { int ret; + ret = -1; + /* Process normal properties */ if (ins->config_map) { ret = flb_config_map_set(&ins->properties, ins->config_map, context); From a489b17c5cfe0cdbec5d82ca247461c26a91d948 Mon Sep 17 00:00:00 2001 From: leonardo-albertovich Date: Fri, 6 Sep 2024 11:07:32 +0200 Subject: [PATCH 3/3] build: fixed typo Signed-off-by: leonardo-albertovich --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e42d4faffc..e2e9fbf3b04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # Fluent Bit Version set(FLB_VERSION_MAJOR 3) -set(FLB_VERSION_MINOR 2) -set(FLB_VERSION_PATCH 0) +set(FLB_VERSION_MINOR 1) +set(FLB_VERSION_PATCH 7) set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}") set(CMAKE_POSITION_INDEPENDENT_CODE ON)