Skip to content
Snippets Groups Projects
  • Dmitry Simonenko's avatar
    737f56de
    Merge branch 'stable' · 737f56de
    Dmitry Simonenko authored
    Conflicts:
    	.gitmodules
    	CMakeLists.txt
    	extra/rpm.spec.in
    	src/CMakeLists.txt
    	src/box/box.cc
    	src/box/box.h
    	src/log_io.cc
    	src/recovery.cc
    	src/tarantool.cc
    	test/unit/CMakeLists.txt
    	test/unit/test.c
    737f56de
    History
    Merge branch 'stable'
    Dmitry Simonenko authored
    Conflicts:
    	.gitmodules
    	CMakeLists.txt
    	extra/rpm.spec.in
    	src/CMakeLists.txt
    	src/box/box.cc
    	src/box/box.h
    	src/log_io.cc
    	src/recovery.cc
    	src/tarantool.cc
    	test/unit/CMakeLists.txt
    	test/unit/test.c