From a4d2fd2b094c2f6bd02d8b40b77abcfb600b5b6f Mon Sep 17 00:00:00 2001 From: cellframe <roman.khlopkov@demlabs.net> Date: Thu, 19 May 2022 12:06:38 +0300 Subject: [PATCH 1/8] [*] HTTP reply fix --- CMakeLists.txt | 2 +- cellframe-sdk | 2 +- python-cellframe | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67d2dcad9..2cb881e62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 1) -SET( CPACK_PACKAGE_VERSION_PATCH 127) +SET( CPACK_PACKAGE_VERSION_PATCH 128) if (CMAKE_TARGET_ARCH MATCHES arm) SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") diff --git a/cellframe-sdk b/cellframe-sdk index 4ca13a282..2da7629a1 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4ca13a282629571a854441a5f42fd966a9300f3c +Subproject commit 2da7629a141ec322c000e8fa9513cbf461bbcf5c diff --git a/python-cellframe b/python-cellframe index fdc4ca676..80aa95bcd 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit fdc4ca6760c612385a3306d080f74b9b3beb21a3 +Subproject commit 80aa95bcd1abc074c7b1067b2e68ddade539fddf -- GitLab From 9d4db411794938d98e29bd5345c324fb1dc44033 Mon Sep 17 00:00:00 2001 From: cellframe <roman.khlopkov@demlabs.net> Date: Thu, 19 May 2022 14:26:20 +0300 Subject: [PATCH 2/8] [*] Sub update --- CMakeLists.txt | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cb881e62..4a19af47a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 1) -SET( CPACK_PACKAGE_VERSION_PATCH 128) +SET( CPACK_PACKAGE_VERSION_PATCH 129) if (CMAKE_TARGET_ARCH MATCHES arm) SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") diff --git a/python-cellframe b/python-cellframe index 80aa95bcd..f114ed433 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 80aa95bcd1abc074c7b1067b2e68ddade539fddf +Subproject commit f114ed433e0e4fdf89c44bba60da5af2111ec343 -- GitLab From 70cd40dd780e43254f8fbfaabfcd3337d6509c69 Mon Sep 17 00:00:00 2001 From: cellframe <roman.khlopkov@demlabs.net> Date: Thu, 19 May 2022 14:52:57 +0300 Subject: [PATCH 3/8] [*] Sub update --- python-cellframe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cellframe b/python-cellframe index f114ed433..e969b4a0f 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit f114ed433e0e4fdf89c44bba60da5af2111ec343 +Subproject commit e969b4a0fd844dfccfa9aae55e0bd4ba93a33753 -- GitLab From 58ae439e8ad803a6f85df8e3bc8d33a4f3dc3c35 Mon Sep 17 00:00:00 2001 From: cellframe <roman.khlopkov@demlabs.net> Date: Fri, 20 May 2022 15:08:17 +0300 Subject: [PATCH 4/8] [*] Subs update --- CMakeLists.txt | 2 +- cellframe-sdk | 2 +- python-cellframe | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81afa7bd1..4a19af47a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 1) -SET( CPACK_PACKAGE_VERSION_PATCH 130) +SET( CPACK_PACKAGE_VERSION_PATCH 129) if (CMAKE_TARGET_ARCH MATCHES arm) SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") diff --git a/cellframe-sdk b/cellframe-sdk index 2c09ae084..9a4a89293 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 2c09ae084ee0574d372a9dfce2b77a0dac7e37fd +Subproject commit 9a4a89293dfdba04c3f06c65d9fda2f1ea2fa289 diff --git a/python-cellframe b/python-cellframe index beebf71ee..bbf30082a 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit beebf71ee118b6d6e45c8bbbece8a6baade6624f +Subproject commit bbf30082ad9d48ed1bd36196d2651f56e8336b12 -- GitLab From 1672488ef05aec50a97aabfbcfce5a5e6936eda7 Mon Sep 17 00:00:00 2001 From: cellframe <roman.khlopkov@demlabs.net> Date: Tue, 24 May 2022 11:18:33 +0300 Subject: [PATCH 5/8] [*] HTTP reply fix --- CMakeLists.txt | 2 +- cellframe-sdk | 2 +- python-cellframe | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdf20f47c..ed8a042da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 1) -SET( CPACK_PACKAGE_VERSION_PATCH 131) +SET( CPACK_PACKAGE_VERSION_PATCH 132) if (CMAKE_TARGET_ARCH MATCHES arm) SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") diff --git a/cellframe-sdk b/cellframe-sdk index 9a4a89293..13555d963 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 9a4a89293dfdba04c3f06c65d9fda2f1ea2fa289 +Subproject commit 13555d9636b9d7c64a8589f940b4d385cf3b21c9 diff --git a/python-cellframe b/python-cellframe index ca70ee4a5..bdc1360c5 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit ca70ee4a5900a52df739e6581c90555cb9e87182 +Subproject commit bdc1360c5a328951977129058837635da4c96116 -- GitLab From d1285d99e05c86e1c4bd5877f691256914c66704 Mon Sep 17 00:00:00 2001 From: cellframe <roman.khlopkov@demlabs.net> Date: Tue, 24 May 2022 13:20:41 +0300 Subject: [PATCH 6/8] [*] Conflicts resolved --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 13555d963..87ac47c8d 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 13555d9636b9d7c64a8589f940b4d385cf3b21c9 +Subproject commit 87ac47c8d50ff5f8dab63b363c256f5d8632ab17 -- GitLab From 4dc65958d3a1917c4183144edcf824ed8d1b422d Mon Sep 17 00:00:00 2001 From: "dmitriy.gerasimov" <naeper@demlabs.net> Date: Fri, 27 May 2022 08:52:31 +0000 Subject: [PATCH 7/8] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed8a042da..474abd022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 1) -SET( CPACK_PACKAGE_VERSION_PATCH 132) +SET( CPACK_PACKAGE_VERSION_PATCH 133) if (CMAKE_TARGET_ARCH MATCHES arm) SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") -- GitLab From ebd3b1bfe25efbda008d71dcd6c6bd71463b5c0e Mon Sep 17 00:00:00 2001 From: "dmitriy.gerasimov" <naeper@demlabs.net> Date: Fri, 27 May 2022 08:59:47 +0000 Subject: [PATCH 8/8] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 474abd022..c9c81ad8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 1) -SET( CPACK_PACKAGE_VERSION_PATCH 133) +SET( CPACK_PACKAGE_VERSION_PATCH 136) if (CMAKE_TARGET_ARCH MATCHES arm) SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") -- GitLab