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

5690f1e4

Commit 5690f1e4 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

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

parents e55f0969 0ff0baf0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
doc/www/content/newsite/benchmark.yml 3 additions, 5 deletions

doc/www/content/newsite/benchmark.yml
doc/www/content/newsite/download.yml.in 2 additions, 1 deletion

doc/www/content/newsite/download.yml.in
src/assoc.h 51 additions, 0 deletions

src/assoc.h
src/box/schema.cc 28 additions, 2 deletions

src/box/schema.cc
src/box/schema.h 2 additions, 6 deletions

src/box/schema.h
test/replication/conflict.result 63 additions, 0 deletions

test/replication/conflict.result
test/replication/conflict.test.py 120 additions, 0 deletions

test/replication/conflict.test.py

with 270 additions and 15 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