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

6d59ce02

Commit 6d59ce02 authored 10 years ago by bigbes

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	extra/rpm.spec.in
	extra/rpm/tarantool.rpm.spec.in
	test/CMakeLists.txt

parents b51cc637 343028df

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

cmake/rpm.cmake 38 additions, 41 deletions

cmake/rpm.cmake
extra/CMakeLists.txt 0 additions, 1 deletion

extra/CMakeLists.txt
extra/rpm.spec.in 0 additions, 178 deletions

extra/rpm.spec.in
extra/rpm/tarantool-scl.rpm.spec 7 additions, 1 deletion

extra/rpm/tarantool-scl.rpm.spec
extra/rpm/tarantool.rpm.spec.in 9 additions, 10 deletions

extra/rpm/tarantool.rpm.spec.in
test/CMakeLists.txt 1 addition, 1 deletion

test/CMakeLists.txt

with 55 additions and 232 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