Merge remote-tracking branch 'origin/1.6' into 1.6
No related branches found
No related tags found
Showing
- debian/control 3 additions, 0 deletionsdebian/control
- doc/www/content/newsite/download.yml.in 2 additions, 2 deletionsdoc/www/content/newsite/download.yml.in
- doc/www/content/newsite/index.yml 1 addition, 1 deletiondoc/www/content/newsite/index.yml
- extra/rpm/mock/tarantool-fedora-21-i386.cfg 68 additions, 0 deletionsextra/rpm/mock/tarantool-fedora-21-i386.cfg
- extra/rpm/mock/tarantool-fedora-21-x86_64.cfg 68 additions, 0 deletionsextra/rpm/mock/tarantool-fedora-21-x86_64.cfg
- extra/rpm/mock/tarantool-fedora-22-i386.cfg 60 additions, 0 deletionsextra/rpm/mock/tarantool-fedora-22-i386.cfg
- extra/rpm/mock/tarantool-fedora-22-x86_64.cfg 60 additions, 0 deletionsextra/rpm/mock/tarantool-fedora-22-x86_64.cfg
- src/box/box.cc 27 additions, 17 deletionssrc/box/box.cc
- src/box/box.h 8 additions, 8 deletionssrc/box/box.h
- src/box/lua/load_cfg.lua 20 additions, 14 deletionssrc/box/lua/load_cfg.lua
- src/box/lua/snapshot_daemon.lua 5 additions, 5 deletionssrc/box/lua/snapshot_daemon.lua
- src/box/relay.cc 2 additions, 4 deletionssrc/box/relay.cc
- src/box/relay.h 3 additions, 0 deletionssrc/box/relay.h
- src/lua/log.lua 7 additions, 1 deletionsrc/lua/log.lua
- test/app/console.test.lua 2 additions, 1 deletiontest/app/console.test.lua
- test/box/cfg.result 9 additions, 9 deletionstest/box/cfg.result
Loading
Please register or sign in to comment