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

dd697bd5

Commit dd697bd5 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/diag-set-clienterror' into 1.6

Conflicts:
	src/diag.h

parents e30d0381 f67bc1e2

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.cc 2 additions, 0 deletions

src/box/box.cc
src/box/error.cc 21 additions, 0 deletions

src/box/error.cc
src/box/error.h 3 additions, 0 deletions

src/box/error.h
src/box/lua/tuple.cc 5 additions, 2 deletions

src/box/lua/tuple.cc
src/diag.h 3 additions, 0 deletions

src/diag.h

with 34 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