Branch: refs/heads/box-#762091
Home:   https://github.com/mailru/tarantool

Commit: 72bfb7f931758faea48e98a93ae01aa25a9093a7
    
https://github.com/mailru/tarantool/commit/72bfb7f931758faea48e98a93ae01aa25a9093a7
Author: Roman Tokarev <[email protected]>
Date:   2011-05-11 (Wed, 11 May 2011)

Changed paths:
  M core/CMakeLists.txt
  A core/errcode.c
  M core/iproto.c
  M core/pickle.c
  A include/errcode.h
  M include/fiber.h
  M include/iproto.h
  M include/util.h
  M mod/silverbox/box.c
  M mod/silverbox/box.h
  M mod/silverbox/index.c
  M mod/silverbox/memcached.c
  M mod/silverbox/memcached.rl

Log Message:
-----------
Isolate error codes definition from iproto.[ch] to errcode.[ch].
Add errcode_record structure that contains string represenataion of
an error, numerical value of an error to send to a client, and
textual description of an error.


Commit: 7c0620f4ac272d8fd591738b832af672bda49d25
    
https://github.com/mailru/tarantool/commit/7c0620f4ac272d8fd591738b832af672bda49d25
Author: Roman Tokarev <[email protected]>
Date:   2011-05-11 (Wed, 11 May 2011)

Changed paths:
  M include/errcode.h

Log Message:
-----------
Make implicit numeration for error codes.


Commit: a663458716eb5a4a9b071170909e5484b03af3a8
    
https://github.com/mailru/tarantool/commit/a663458716eb5a4a9b071170909e5484b03af3a8
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-11 (Wed, 11 May 2011)

Changed paths:
  M core/errcode.c
  M include/errcode.h

Log Message:
-----------
Bug#769040, review comments.

Move the definition of an auxiliary macro to errcode.c.
Remove a barely justified macro.


Commit: e7efa2bb9f8f2cd049fa0b4d3144cb45c16bfb7f
    
https://github.com/mailru/tarantool/commit/e7efa2bb9f8f2cd049fa0b4d3144cb45c16bfb7f
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-11 (Wed, 11 May 2011)

Changed paths:
  M core/CMakeLists.txt
  A core/errcode.c
  M core/iproto.m
  M core/pickle.m
  A include/errcode.h
  M include/fiber.h
  M include/iproto.h
  M include/util.h
  M mod/box/box.m
  M mod/box/index.m
  M mod/box/memcached.m
  M mod/box/memcached.rl

Log Message:
-----------
Merge branch 'master-stable'

Manual merge.

Conflicts:
        core/CMakeLists.txt
        core/pickle.m
        mod/box/box.h
        mod/box/memcached.m


Commit: cabfe89db8088a7e582ee34356deeface00921ce
    
https://github.com/mailru/tarantool/commit/cabfe89db8088a7e582ee34356deeface00921ce
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M core/errcode.c
  M include/errcode.h

Log Message:
-----------
Bug#769040, review comments.

Move the definition of an auxiliary macro to errcode.c.
Remove a barely justified macro.


Commit: 0bd5be3806f37d2a244e193428941a15e2897465
    
https://github.com/mailru/tarantool/commit/0bd5be3806f37d2a244e193428941a15e2897465
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Log Message:
-----------
Merge branch 'master-stable' of github.com:mailru/tarantool into master-stable


Commit: 2633f6937ff45d3a4189e0c9f0af58ccc1e2a4e1
    
https://github.com/mailru/tarantool/commit/2633f6937ff45d3a4189e0c9f0af58ccc1e2a4e1
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M core/errcode.c
  M core/iproto.c
  M include/errcode.h
  M mod/silverbox/box.h
  M mod/silverbox/memcached.c
  M mod/silverbox/memcached.rl

Log Message:
-----------
Bug#769040, review comments.

Replace a few more macros with inline functions.


Commit: dc18d1f533ca727ce4c4eaa63efef86870f8cf1d
    
https://github.com/mailru/tarantool/commit/dc18d1f533ca727ce4c4eaa63efef86870f8cf1d
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M core/errcode.c
  M core/iproto.m
  M include/errcode.h
  M mod/box/box.m
  M mod/box/memcached.m
  M mod/box/memcached.rl

Log Message:
-----------
Merge branch 'master-stable'

Conflicts:
        mod/box/box.h
        mod/silverbox/memcached.c


Commit: 32b51380f37344ad7d1f929c004a05e827c9c78e
    
https://github.com/mailru/tarantool/commit/32b51380f37344ad7d1f929c004a05e827c9c78e
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M core/CMakeLists.txt
  A core/tarantool_ev.c
  R core/tarantool_ev.m

Log Message:
-----------
Fix a broken buildbot build (-Wno-unused-result support).

tarantool_ev.m doesn't have to be an Objective C file,
since it's only a wrapper around C file ev.c.


Commit: f1926d47c7e4d13aa5b9885bfe615e4d6767df66
    
https://github.com/mailru/tarantool/commit/f1926d47c7e4d13aa5b9885bfe615e4d6767df66
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M core/CMakeLists.txt
  A core/errcode.c
  M core/iproto.m
  M core/pickle.m
  A core/tarantool_ev.c
  R core/tarantool_ev.m
  A include/errcode.h
  M include/fiber.h
  M include/iproto.h
  M include/util.h
  M mod/box/box.m
  M mod/box/index.m
  M mod/box/memcached.m
  M mod/box/memcached.rl

Log Message:
-----------
Merge branch 'master' into box-#762091


Commit: 5d47d2b6a9f4193c447f7bb6b8a18ef5b3968e02
    
https://github.com/mailru/tarantool/commit/5d47d2b6a9f4193c447f7bb6b8a18ef5b3968e02
Author: Konstantin Osipov <[email protected]>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M CMakeLists.txt
  A cmake/check_objective_c_compiler.cmake

Log Message:
-----------
Bug#762091: review comments.

Move the cmake check for ObjectiveC compiler to an own
file. Tweak the output a bit.


Compare: https://github.com/mailru/tarantool/compare/65a207b...5d47d2b

_______________________________________________
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