Merge remote-tracking branch 'origin/master' into 1.6
Conflicts: doc/sphinx/reference/fiber-ipc.rst
No related branches found
No related tags found
Showing
- doc/sphinx/book/administration.rst 8 additions, 8 deletionsdoc/sphinx/book/administration.rst
- doc/sphinx/book/box/box_error.rst 15 additions, 7 deletionsdoc/sphinx/book/box/box_error.rst
- doc/sphinx/book/box/box_index.rst 17 additions, 1 deletiondoc/sphinx/book/box/box_index.rst
- doc/sphinx/book/box/index.rst 3 additions, 1 deletiondoc/sphinx/book/box/index.rst
- doc/sphinx/book/box/limitations.rst 2 additions, 0 deletionsdoc/sphinx/book/box/limitations.rst
- doc/sphinx/book/box/triggers.rst 11 additions, 11 deletionsdoc/sphinx/book/box/triggers.rst
- doc/sphinx/book/replication/index.rst 26 additions, 1 deletiondoc/sphinx/book/replication/index.rst
- doc/sphinx/dev_guide/building_from_source.rst 3 additions, 3 deletionsdoc/sphinx/dev_guide/building_from_source.rst
- doc/sphinx/dev_guide/index.rst 1 addition, 0 deletionsdoc/sphinx/dev_guide/index.rst
- doc/sphinx/reference/box.rst 10 additions, 0 deletionsdoc/sphinx/reference/box.rst
- doc/sphinx/reference/fiber-ipc.rst 2 additions, 2 deletionsdoc/sphinx/reference/fiber-ipc.rst
- doc/sphinx/reference/index.rst 1 addition, 0 deletionsdoc/sphinx/reference/index.rst
- doc/sphinx/reference/socket.rst 15 additions, 5 deletionsdoc/sphinx/reference/socket.rst
- src/coeio.h 1 addition, 1 deletionsrc/coeio.h
- src/say.h 2 additions, 2 deletionssrc/say.h
Loading
Please register or sign in to comment