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

f30745e0

Commit f30745e0 authored 8 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/1.6' into 1.7

parents 7d817b39 3de90cf5

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 16 additions, 18 deletions

.travis.yml
src/box/box.cc 8 additions, 7 deletions

src/box/box.cc
src/box/box.h 8 additions, 2 deletions

src/box/box.h
test-run 1 addition, 1 deletion

test-run
test/box-tap/cfg.result 2 additions, 1 deletion

test/box-tap/cfg.result
test/box-tap/cfg.test.lua 9 additions, 1 deletion

test/box-tap/cfg.test.lua
test/box/suite.ini 1 addition, 1 deletion

test/box/suite.ini
test/xlog/snapshot_daemon.result 6 additions, 6 deletions

test/xlog/snapshot_daemon.result
test/xlog/snapshot_daemon.test.lua 6 additions, 6 deletions

test/xlog/snapshot_daemon.test.lua

with 57 additions and 43 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