Merge branch 'roles'
Conflicts: src/box/lua/schema.lua
Showing
- extra/schema_fill.lua 2 additions, 2 deletionsextra/schema_fill.lua
- src/box/access.h 1 addition, 1 deletionsrc/box/access.h
- src/box/alter.cc 6 additions, 3 deletionssrc/box/alter.cc
- src/box/key_def.h 25 additions, 2 deletionssrc/box/key_def.h
- src/box/lua/call.cc 3 additions, 5 deletionssrc/box/lua/call.cc
- src/box/lua/index.cc 1 addition, 1 deletionsrc/box/lua/index.cc
- src/box/lua/schema.lua 82 additions, 17 deletionssrc/box/lua/schema.lua
- src/box/request.cc 4 additions, 4 deletionssrc/box/request.cc
- src/box/space.cc 3 additions, 3 deletionssrc/box/space.cc
- src/box/space.h 2 additions, 2 deletionssrc/box/space.h
- src/errcode.h 2 additions, 0 deletionssrc/errcode.h
- test/box/access.result 7 additions, 7 deletionstest/box/access.result
- test/box/access.test.lua 7 additions, 7 deletionstest/box/access.test.lua
- test/box/misc.result 2 additions, 0 deletionstest/box/misc.result
- test/box/role.result 56 additions, 0 deletionstest/box/role.result
- test/box/role.test.lua 17 additions, 0 deletionstest/box/role.test.lua
Loading
Please register or sign in to comment