Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: 8f91195e6db1ffa5a97f3e499c46f99a0d0659c8
      
https://github.com/mailru/tarantool/commit/8f91195e6db1ffa5a97f3e499c46f99a0d0659c8
  Author: Dmitry E. Oboukhov <[email protected]>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M doc/user/stored-procedures.xml
    M include/stat.h
    M mod/box/CMakeLists.txt
    M mod/box/box_lua.m
    A mod/box/box_lua_stat.h
    A mod/box/box_lua_stat.m
    M src/stat.m
    M test/box/lua.result
    A test/box/lua_box_stat.result
    A test/box/lua_box_stat.test

  Log Message:
  -----------
  add box.stat table


  Commit: 447f9012c7ee6f171e715ee800dd40ed483b85e8
      
https://github.com/mailru/tarantool/commit/447f9012c7ee6f171e715ee800dd40ed483b85e8
  Author: Dmitry E. Oboukhov <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M mod/box/CMakeLists.txt
    M mod/box/box_lua.m
    R mod/box/box_lua_stat.h
    R mod/box/box_lua_stat.m
    M src/CMakeLists.txt
    A src/box_lua_stat.h
    A src/box_lua_stat.m
    M src/tarantool_lua.m

  Log Message:
  -----------
  fix box.stat by review


  Commit: 41fc91db9d602b09c613c3790628b6104227a808
      
https://github.com/mailru/tarantool/commit/41fc91db9d602b09c613c3790628b6104227a808
  Author: Dmitry E. Oboukhov <[email protected]>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M include/stat.h
    M src/box_lua_stat.m
    M src/stat.m
    M test/box/admin.result
    M test/box/lua.result
    M test/box/stat.result

  Log Message:
  -----------
  some fixes by review: code cleanup


  Commit: 65fb1b88e9c6c3ba1c0130b273486a4d618d5d1f
      
https://github.com/mailru/tarantool/commit/65fb1b88e9c6c3ba1c0130b273486a4d618d5d1f
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M doc/user/stored-procedures.xml
    M include/stat.h
    M src/CMakeLists.txt
    M src/admin.m
    M src/admin.rl
    R src/box_lua_stat.h
    R src/box_lua_stat.m
    M src/stat.m
    M src/tarantool_lua.m
    A src/tarantool_lua_stat.h
    A src/tarantool_lua_stat.m
    M test/box/admin.result
    R test/box/lua_box_stat.result
    R test/box/lua_box_stat.test
    M test/box/stat.result
    A test/box/stat_lua.result
    A test/box/stat_lua.test

  Log Message:
  -----------
  box.stat: review fixes

Move print_stat to admin.rl
Make tarantool_lua_stat.m a bit simpler.
Restore the original formatting of show stat.
Fix a bug when rps and total were reversed
in the new show stat output.


  Commit: e4cd1022decae9a29e26eed173f61b504a78a042
      
https://github.com/mailru/tarantool/commit/e4cd1022decae9a29e26eed173f61b504a78a042
  Author: Konstantin Osipov <[email protected]>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M doc/user/stored-procedures.xml
    M include/stat.h
    M src/CMakeLists.txt
    M src/admin.m
    M src/admin.rl
    M src/stat.m
    M src/tarantool_lua.m
    M src/tarantool_lua_info.h
    M src/tarantool_lua_info.m
    M src/tarantool_lua_slab.h
    M src/tarantool_lua_slab.m
    A src/tarantool_lua_stat.h
    A src/tarantool_lua_stat.m
    M test/box/lua.result
    A test/box/stat_lua.result
    A test/box/stat_lua.test

  Log Message:
  -----------
  Merge branch 'box.stat'

Conflicts:
        src/CMakeLists.txt
        src/admin.m
        src/tarantool_lua.m
        test/box/lua.result


Compare: https://github.com/mailru/tarantool/compare/98100bde5711...e4cd1022deca
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help   : https://help.launchpad.net/ListHelp

Reply via email to