diff --git a/CMakeLists.txt b/CMakeLists.txt index 7df123f9ca3dbf2e4d5d008af24e837e90ab0f16..4216c57f5644cb5bff90b157dcbe258b2f1f63d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ include(cmake/set_build_flags.cmake) #set(CMAKE_C_COMPILER "gcc" CACHE PATH "c compiler") -set(GIT_COMMIT_HASH "6d6aa4d6e16bbd87bb387ed38826e0d9ef73c6e6") +set(GIT_COMMIT_HASH "db9776baefe6a94c1d40b5b70aea05e75254f6dd") message("-- commit id: " ${GIT_COMMIT_HASH}) add_definitions(-DISULAD_GIT_COMMIT="${GIT_COMMIT_HASH}") diff --git a/cmake/options.cmake b/cmake/options.cmake index 0343339a412f6524d67c6bbd75adc752fd6748a5..b52a27f976edc05501f41f92a69492a7d659df26 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -6,7 +6,7 @@ endif() option(VERSION "set isulad version" ON) if (VERSION STREQUAL "ON") - set(ISULAD_VERSION "2.0.14") + set(ISULAD_VERSION "2.0.15") message("${BoldBlue}Version: ${ISULAD_VERSION} ${ColourReset}") endif() diff --git a/iSulad.spec b/iSulad.spec index 6cbef56c329541cc112541a12996e04b4f805c88..bb6b7ff032a82dab1e52a8c01347ff7a743d73af 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ -%global _version 2.0.14 -%global _release 1 +%global _version 2.0.15 +%global _release 2 %global is_systemd 1 %global enable_shimv2 1 %global enable_embedded 1 diff --git a/release_notes b/release_notes index 39b67f1a82fdbde3781da5f37a20da2049c2d35e..ead18b8c0cba599ac0edb78f8f04ed31a9ef3704 100644 --- a/release_notes +++ b/release_notes @@ -1,3 +1,39 @@ +2022-07-13 ubuntu release 2.0.15 + - !1523 Add rest api for stats + - !1520 stop health check monitor before stopping container Merge pull request !1520 from JingWoo/stable-v2.0.x + - !1518 sync patches from master + - !1512 refactor fuzz + - !1499 wait exit fifo if runtime start failed From: @zh_xiaoyu Reviewed-by: @jingwoo, @duguhaotian Signed-off-by: @duguhaotian + - !1498 cherry pick recent commits from master to stable branch From: @chengzrz Reviewed-by: @wangfengtu, @jingwoo Signed-off-by: @jingwoo + - !1490 [v2.0.14]可能的double free (src/cmd/isula/information/ps.c:856) From: @songbuhuang Reviewed-by: @jingwoo Signed-off-by: @jingwoo + - !1485 gc considers stored monitor pid From: @vegbir Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1483 fix misuse of BUFSIZ From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1478 use util_smart_calloc_t to prevent overflow From: @jingwoo Reviewed-by: @zh_xiaoyu, @duguhaotian Signed-off-by: @duguhaotian + - !1481 increase websocket lws_lookup size From: @zh_xiaoyu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1476 refactor parse_volume function Merge pull request !1476 from JingWoo/My2022-stable + - !1475 refactor devmapper_parse_options function Merge pull request !1475 from JingWoo/My2022-stable + - !1473 fix inspect -f error when bionic Merge pull request !1473 from wangfengtu/inspect_stable + - !1471 set the name of each container and image operation thread for restful version Merge pull request !1471 from JingWoo/My2022-stable + - !1470 set the name of each container and image operation thread Merge pull request !1470 from JingWoo/My2022-stable + - !1464 fix shm size set invalid when reboot Merge pull request !1464 from zhangxiaoyu/stable-v2.0.x + - !1463 sync from master branch From: @duguhaotian Reviewed-by: @jingwoo Signed-off-by: @jingwoo + - !1459 fix isulad-shim coredump when remove ioc fd node Merge pull request !1459 from zhangxiaoyu/stable-v2.0.x + - !1455 bugfix for double free and use after free From: @zh_xiaoyu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1454 fix get_network_namespace_path check From: @zh_xiaoyu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1453 fix invalid convert and format From: @duguhaotian Reviewed-by: @jingwoo Signed-off-by: @jingwoo + - !1451 update seccomp to Linux 5.10 syscall list From: @zh_xiaoyu Reviewed-by: @jingwoo Signed-off-by: @jingwoo + - !1448 remove check parameter label_opts in init_label From: @zh_xiaoyu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1446 remove static of strlncat Merge pull request !1446 from zhangxiaoyu/stable-v2.0.x + - !1445 sync from master branch From: @duguhaotian Reviewed-by: @jingwoo Signed-off-by: @jingwoo + - !1441 sync from master branch seccomp optimiazation Merge pull request !1441 from czrz/stable-v2.0.x + - !1440 improve fuzz for pw gr parser Merge pull request !1440 from haozi007/stable-v2.0.x + - !1437 fix install error when android From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1435 do not mkdir of isulad if no controller found From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + + dev stats: + - 214 files changed, 3075 insertions(+), 2058 deletions(-) + - contributors: zhangxiaoyu, WangFengTu, haozi007, wujing, Neil.wrz, William Dean, ger202, vegbir, chegJH, chengzrz + 2022-05-23 root release 2.0.14 - !1432 sync from master branch From: @duguhaotian Reviewed-by: @wangfengtu, @jingwoo Signed-off-by: @jingwoo - !1422 sync two patches from master Merge pull request !1422 from wangfengtu/sync