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

8c27f5b3

Commit 8c27f5b3 authored 8 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/1.6' into 1.7

parents 0a32b002 5f7df77f

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 6 additions, 6 deletions

.travis.yml
cmake/os.cmake 9 additions, 0 deletions

cmake/os.cmake
src/iobuf.h 1 addition, 1 deletion

src/iobuf.h

with 16 additions and 7 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