Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

af9e0c3c

Commit af9e0c3c authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/gh-338-remote-console'

Conflicts:
	src/lua/yaml.cc

parents d3751f27 e73f775b

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/admin.cc 21 additions, 4 deletions

src/admin.cc
src/ffisyms.cc 0 additions, 1 deletion

src/ffisyms.cc
src/lua/console.lua 149 additions, 0 deletions

src/lua/console.lua
src/lua/init.cc 60 additions, 162 deletions

src/lua/init.cc
src/lua/init.h 0 additions, 5 deletions

src/lua/init.h
src/lua/interactive.lua 0 additions, 14 deletions

src/lua/interactive.lua
test/box/misc.result 2 additions, 2 deletions

test/box/misc.result

with 233 additions and 189 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment