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

78280135

Commit 78280135 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable'

Merge box.digest from stable

Conflicts:
	src/lua/init.cc
	test/box/lua.result

parents aca6f4cd b2f12a0d

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 0 deletions

src/CMakeLists.txt
src/lua/digest.lua 111 additions, 0 deletions

src/lua/digest.lua
src/lua/init.cc 2 additions, 2 deletions

src/lua/init.cc
test/box/digest.result 148 additions, 0 deletions

test/box/digest.result
test/box/digest.test 46 additions, 0 deletions

test/box/digest.test
test/box/misc.result 1 addition, 0 deletions

test/box/misc.result

with 309 additions and 2 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