Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ba44d4da

Commit ba44d4da authored 10 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	connector/c/tntsql/tnt_sql.c
	src/palloc.cc

parents 1d1593be fb2fc285

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

cmake/BuildLibCJSON.cmake 5 additions, 0 deletions

cmake/BuildLibCJSON.cmake
cmake/compiler.cmake 2 additions, 0 deletions

cmake/compiler.cmake
src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/box/engine.h 1 addition, 1 deletion

src/box/engine.h
src/box/key_def.h 1 addition, 1 deletion

src/box/key_def.h
src/box/sophia_index.cc 1 addition, 0 deletions

src/box/sophia_index.cc
src/fiber.h 2 additions, 2 deletions

src/fiber.h
src/lua/socket.cc 0 additions, 13 deletions

src/lua/socket.cc
src/mutex.h 1 addition, 1 deletion

src/mutex.h
src/recovery.cc 0 additions, 2 deletions

src/recovery.cc
src/say.cc 0 additions, 0 deletions

src/say.cc
test/unit/CMakeLists.txt 1 addition, 0 deletions

test/unit/CMakeLists.txt
third_party/crc32.c 2 additions, 1 deletion

third_party/crc32.c

with 17 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment