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

7eadb6d3

Commit 7eadb6d3 authored 11 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	test/box/lua_sandbox.result

parents b09659e8 1ef001e5

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

client/tarantar/sha1.c 6 additions, 6 deletions

client/tarantar/sha1.c
client/tarantar/sha1.h 6 additions, 4 deletions

client/tarantar/sha1.h
connector/c/tnt/tnt_call.c 3 additions, 3 deletions

connector/c/tnt/tnt_call.c
connector/c/tnt/tnt_delete.c 2 additions, 2 deletions

connector/c/tnt/tnt_delete.c
connector/c/tnt/tnt_insert.c 2 additions, 2 deletions

connector/c/tnt/tnt_insert.c
connector/c/tnt/tnt_ping.c 1 addition, 1 deletion

connector/c/tnt/tnt_ping.c
connector/c/tnt/tnt_request.c 11 additions, 11 deletions

connector/c/tnt/tnt_request.c
connector/c/tnt/tnt_select.c 3 additions, 3 deletions

connector/c/tnt/tnt_select.c
connector/c/tnt/tnt_update.c 5 additions, 5 deletions

connector/c/tnt/tnt_update.c
include/cpu_feature.h 2 additions, 1 deletion

include/cpu_feature.h
include/crc32.h 1 addition, 1 deletion

include/crc32.h
src/cpu_feature.c 4 additions, 4 deletions

src/cpu_feature.c
third_party/sptree.h 3 additions, 3 deletions

third_party/sptree.h

with 49 additions and 46 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