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

9b80c84f

Commit 9b80c84f authored 11 years ago by bigbes

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	.travis.yml
	client/tarantool/tc.c
	client/tarantool/tc_pager.c
	src/lua/yaml.cc

parents dd567a35 d80b66f3

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 0 deletions

.travis.yml
client/tarantool/main.c 1 addition, 1 deletion

client/tarantool/main.c
client/tarantool/main.h 1 addition, 1 deletion

client/tarantool/main.h
client/tarantool/pager.c 4 additions, 4 deletions

client/tarantool/pager.c
client/tarantool/print.c 4 additions, 10 deletions

client/tarantool/print.c
cmake/FindPostgreSQL.cmake 165 additions, 0 deletions

cmake/FindPostgreSQL.cmake
debian/control 2 additions, 1 deletion

debian/control
src/module/pg/CMakeLists.txt 0 additions, 2 deletions

src/module/pg/CMakeLists.txt

with 178 additions and 19 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