Merge branch 'core-unmmap-after-fork' into master_public
Conflicts: CMakeLists.txt core/coro.c core/fiber.c core/palloc.c include/fiber.h
Showing
- CMakeLists.txt 4 additions, 0 deletionsCMakeLists.txt
- core/coro.c 2 additions, 4 deletionscore/coro.c
- core/fiber.c 27 additions, 3 deletionscore/fiber.c
- core/palloc.c 46 additions, 17 deletionscore/palloc.c
- core/salloc.c 3 additions, 7 deletionscore/salloc.c
- core/tarantool.c 2 additions, 0 deletionscore/tarantool.c
- include/config.h.cmake 11 additions, 0 deletionsinclude/config.h.cmake
- include/fiber.h 4 additions, 0 deletionsinclude/fiber.h
- include/palloc.h 2 additions, 1 deletioninclude/palloc.h
Loading
Please register or sign in to comment