Merge branch 'master' of https://github.com/tarantool/tarantool

.gitignore

README.MacOSX

cmake/BuildSophia.cmake

cmake/package.cmake

src/box/box.cc

src/box/log_io.cc

src/box/log_io.h

src/box/lua/box_net.lua

src/box/recovery.cc

src/box/recovery.h

src/box/replica.cc

src/box/replication.cc

src/box/replication.h

src/box/request.cc

src/box/request.h

src/box/txn.cc

src/box/txn.h

src/errcode.h

src/iproto.cc

src/iproto_constants.cc