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

362e7dd3

Commit 362e7dd3 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stat'

Conflicts:
	src/rmean.cc

parents 85dadc11 04802e41

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.cc 2 additions, 0 deletions

src/box/box.cc
src/box/error.cc 9 additions, 0 deletions

src/box/error.cc
src/box/error.h 9 additions, 0 deletions

src/box/error.h
src/box/index.cc 5 additions, 0 deletions

src/box/index.cc
src/box/iproto.cc 27 additions, 2 deletions

src/box/iproto.cc
src/box/lua/stat.cc 37 additions, 3 deletions

src/box/lua/stat.cc
src/cbus.cc 21 additions, 2 deletions

src/cbus.cc
src/cbus.h 19 additions, 0 deletions

src/cbus.h
src/rmean.cc 6 additions, 4 deletions

src/rmean.cc
src/rmean.h 1 addition, 0 deletions

src/rmean.h
test/box/misc.result 1 addition, 0 deletions

test/box/misc.result
test/box/stat.result 17 additions, 0 deletions

test/box/stat.result
test/box/stat.test.lua 6 additions, 0 deletions

test/box/stat.test.lua
test/box/stat_net.result 57 additions, 0 deletions

test/box/stat_net.result
test/box/stat_net.test.lua 24 additions, 0 deletions

test/box/stat_net.test.lua
test/unit/CMakeLists.txt 2 additions, 1 deletion

test/unit/CMakeLists.txt

with 243 additions and 12 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