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

e3fb5d2b

Commit e3fb5d2b authored 13 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master-stable'

Merge the fix for Bug#748630
into 'master'.

Conflicts:
	test/box/args.result

parents 452ff54c 33b70fc6

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/tarantool.m 1 addition, 1 deletion

core/tarantool.m
include/tarantool.h 2 additions, 1 deletion

include/tarantool.h
mod/box/box.m 2 additions, 0 deletions

mod/box/box.m
mod/feeder/feeder.m 1 addition, 0 deletions

mod/feeder/feeder.m
test/box/args.result 2 additions, 2 deletions

test/box/args.result

with 8 additions and 4 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