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

d210726c

Commit d210726c authored 10 years ago by esha

Downloads
- Plain Diff

Merge branch 'master' into auth-access-test

parents b54b94d3 ccd9c0b1

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 26 additions, 11 deletions

CMakeLists.txt
debian/control 1 addition, 3 deletions

debian/control
debian/rules 1 addition, 1 deletion

debian/rules
debian/tarantool-dev.install 0 additions, 0 deletions

debian/tarantool-dev.install
debian/tarantool-modules.install 2 additions, 2 deletions

debian/tarantool-modules.install
debian/tarantool-mysql-module.install 1 addition, 2 deletions

debian/tarantool-mysql-module.install
debian/tarantool-postgresql-module.install 1 addition, 1 deletion

debian/tarantool-postgresql-module.install
doc/box-protocol.txt 2 additions, 2 deletions

doc/box-protocol.txt
extra/rpm.spec.in 21 additions, 21 deletions

extra/rpm.spec.in
src/CMakeLists.txt 4 additions, 2 deletions

src/CMakeLists.txt
src/box/CMakeLists.txt 0 additions, 4 deletions

src/box/CMakeLists.txt
src/fiob.c 1 addition, 1 deletion

src/fiob.c
src/lua/init.cc 4 additions, 3 deletions

src/lua/init.cc
src/trivia/config.h.cmake 3 additions, 3 deletions

src/trivia/config.h.cmake

with 67 additions and 56 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