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

af2d098f

Commit af2d098f authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable'

Conflicts:
	doc/user/stored-procedures.xml
	src/lua/init.cc
	test/box/fiber.result
	test/box/fiber.test
	test/unit/fiob.c

parents ba38367e cc10d687

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/user/stored-procedures.xml 20 additions, 0 deletions

doc/user/stored-procedures.xml
src/cpu_feature.c 0 additions, 4 deletions

src/cpu_feature.c
src/lib/small/small.c 7 additions, 4 deletions

src/lib/small/small.c
src/lua/fiber.cc 18 additions, 0 deletions

src/lua/fiber.cc
src/lua/init.cc 0 additions, 1 deletion

src/lua/init.cc
test/box/fiber.result 14 additions, 0 deletions

test/box/fiber.result
test/box/fiber.test.lua 7 additions, 0 deletions

test/box/fiber.test.lua
test/unit/base64.c 1 addition, 0 deletions

test/unit/base64.c
third_party/compat/sys/cpuid.h 0 additions, 188 deletions

third_party/compat/sys/cpuid.h

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