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

1cc826e6

Commit 1cc826e6 authored 11 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	test/box/socket.test

parents 733ad6e7 381f7f3e

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 14 deletions

CMakeLists.txt
cmake/CMakeTestOBJCCompiler.cmake 0 additions, 48 deletions

cmake/CMakeTestOBJCCompiler.cmake
cmake/CMakeTestOBJCXXCompiler.cmake 0 additions, 48 deletions

cmake/CMakeTestOBJCXXCompiler.cmake
cmake/FindLibOBJC.cmake 0 additions, 18 deletions

cmake/FindLibOBJC.cmake
cmake/FindOptionalPackage.cmake 29 additions, 0 deletions

cmake/FindOptionalPackage.cmake
include/tarantool/config.h.cmake 0 additions, 3 deletions

include/tarantool/config.h.cmake
src/CMakeLists.txt 0 additions, 5 deletions

src/CMakeLists.txt
src/plugin/mysql/CMakeLists.txt 2 additions, 3 deletions

src/plugin/mysql/CMakeLists.txt
src/plugin/pg/CMakeLists.txt 1 addition, 1 deletion

src/plugin/pg/CMakeLists.txt
test/box/args.test 0 additions, 2 deletions

test/box/args.test
test/box/socket.result 0 additions, 12 deletions

test/box/socket.result
test/box/socket.test 1 addition, 4 deletions

test/box/socket.test

with 35 additions and 158 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