Merge remote-tracking branch 'origin/master' into replica-ro-without-id
Showing
- doc/user/configuration-reference.xml 30 additions, 20 deletionsdoc/user/configuration-reference.xml
- doc/user/databases.xml 60 additions, 29 deletionsdoc/user/databases.xml
- doc/user/replication.xml 3 additions, 3 deletionsdoc/user/replication.xml
- doc/user/stored-procedures.xml 6 additions, 3 deletionsdoc/user/stored-procedures.xml
- src/box/recovery.cc 1 addition, 1 deletionsrc/box/recovery.cc
- src/coeio.cc 1 addition, 2 deletionssrc/coeio.cc
Loading
Please register or sign in to comment