Branch: refs/heads/master
  Home:   https://github.com/mailru/tarantool
  Commit: a7e1523f86e6fb9ee43e8b2e3be0ba5f19fed8e3
      
https://github.com/mailru/tarantool/commit/a7e1523f86e6fb9ee43e8b2e3be0ba5f19fed8e3
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    A src/admin.cc
    R src/admin.m
    A src/assoc.cc
    R src/assoc.m
    A src/box/bitset_index.cc
    R src/box/bitset_index.m
    A src/box/box.cc
    R src/box/box.m
    A src/box/box_lua.cc
    R src/box/box_lua.m
    A src/box/box_lua_space.cc
    R src/box/box_lua_space.m
    A src/box/hash_index.cc
    R src/box/hash_index.m
    A src/box/index.cc
    R src/box/index.m
    A src/box/port.cc
    R src/box/port.m
    A src/box/request.cc
    R src/box/request.m
    A src/box/space.cc
    R src/box/space.m
    A src/box/tree_index.cc
    R src/box/tree_index.m
    A src/box/tuple.cc
    R src/box/tuple.m
    A src/box/txn.cc
    R src/box/txn.m
    A src/coeio.cc
    R src/coeio.m
    A src/coio.cc
    R src/coio.m
    A src/coio_buf.cc
    R src/coio_buf.m
    A src/coro.cc
    R src/coro.m
    A src/cpu_feature.c
    R src/cpu_feature.m
    A src/errinj.cc
    R src/errinj.m
    A src/evio.cc
    R src/evio.m
    A src/exception.cc
    R src/exception.m
    A src/fiber.cc
    R src/fiber.m
    A src/iobuf.cc
    R src/iobuf.m
    A src/ipc.cc
    R src/ipc.m
    A src/iproto.cc
    R src/iproto.m
    A src/log_io.cc
    R src/log_io.m
    A src/lua/info.cc
    R src/lua/info.m
    A src/lua/init.cc
    R src/lua/init.m
    A src/lua/lua_ipc.cc
    R src/lua/lua_ipc.m
    A src/lua/lua_socket.cc
    R src/lua/lua_socket.m
    A src/lua/session.cc
    R src/lua/session.m
    A src/lua/slab.cc
    R src/lua/slab.m
    A src/lua/stat.cc
    R src/lua/stat.m
    A src/lua/uuid.cc
    R src/lua/uuid.m
    A src/memcached-grammar.cc
    R src/memcached-grammar.m
    A src/memcached.cc
    R src/memcached.m
    A src/object.cc
    R src/object.m
    A src/palloc.cc
    R src/palloc.m
    A src/pickle.cc
    R src/pickle.m
    A src/recovery.cc
    R src/recovery.m
    A src/replica.cc
    R src/replica.m
    A src/replication.cc
    R src/replication.m
    A src/salloc.cc
    R src/salloc.m
    A src/say.cc
    R src/say.m
    A src/session.cc
    R src/session.m
    A src/sio.cc
    R src/sio.m
    A src/stat.cc
    R src/stat.m
    A src/tarantool.cc
    R src/tarantool.m
    A src/tbuf.c
    R src/tbuf.m
    A src/trace.c
    R src/trace.m
    A src/util.c
    R src/util.m

  Log Message:
  -----------
  C++: rename .m files to .cc


  Commit: 0213341885eb8b1845e4f4d58210b631fdcecb8e
      
https://github.com/mailru/tarantool/commit/0213341885eb8b1845e4f4d58210b631fdcecb8e
  Author: Roman Tsisyk <[email protected]>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M CMakeLists.txt
    M cfg/warning.c
    M cfg/warning.h
    M client/tarantool_checksum/tc_space.c
    M cmake/compiler.cmake
    M cmake/luajit.cmake
    M include/assoc.h
    M include/box/box.h
    M include/crc32.h
    M include/errinj.h
    M include/exception.h
    M include/fiber.h
    M include/fio.h
    M include/iobuf.h
    M include/lib/bit/bit.h
    M include/lib/bitset/bitset.h
    M include/lib/bitset/expr.h
    M include/lib/bitset/index.h
    M include/lib/bitset/iterator.h
    M include/mhash.h
    M include/object.h
    M include/palloc.h
    M include/pickle.h
    M include/recovery.h
    M include/replication.h
    M include/rlist.h
    M include/rope.h
    M include/say.h
    A include/scoped_guard.h
    M include/sio.h
    M include/stat.h
    M include/tarantool.h
    M include/tbuf.h
    M include/util.h
    M src/CMakeLists.txt
    M src/admin.cc
    M src/admin.rl
    M src/box/CMakeLists.txt
    M src/box/bitset_index.cc
    M src/box/bitset_index.h
    M src/box/box.cc
    M src/box/box_lua.cc
    M src/box/box_lua_space.cc
    M src/box/hash_index.cc
    M src/box/hash_index.h
    M src/box/index.cc
    M src/box/index.h
    M src/box/port.cc
    M src/box/request.cc
    M src/box/space.cc
    M src/box/space.h
    M src/box/tree_index.cc
    M src/box/tree_index.h
    M src/box/tuple.cc
    M src/box/txn.cc
    M src/coeio.cc
    M src/coio.cc
    M src/coro.cc
    M src/errinj.cc
    M src/evio.cc
    M src/exception.cc
    M src/fiber.cc
    M src/iobuf.cc
    M src/ipc.cc
    M src/iproto.cc
    M src/lib/bit/CMakeLists.txt
    M src/lib/bit/bit.c
    M src/lib/bitset/index.c
    M src/lib/bitset/page.h
    M src/log_io.cc
    M src/lua/info.cc
    M src/lua/init.cc
    M src/lua/lua_ipc.cc
    M src/lua/lua_socket.cc
    M src/lua/session.cc
    M src/lua/slab.cc
    M src/lua/stat.cc
    M src/lua/uuid.cc
    M src/memcached-grammar.cc
    M src/memcached-grammar.rl
    M src/memcached.cc
    M src/object.cc
    A src/opts.c
    M src/palloc.cc
    M src/pickle.cc
    M src/recovery.cc
    M src/replica.cc
    M src/replication.cc
    M src/salloc.cc
    M src/say.cc
    A src/scoped_guard.cc
    M src/session.cc
    M src/sio.cc
    M src/stat.cc
    M src/tarantool.cc
    M src/tbuf.c
    M src/util.c
    M test/box/args.result
    M test/unit/CMakeLists.txt
    R test/unit/objc_catchcxx.m
    R test/unit/objc_catchcxx.result
    R test/unit/objc_catchcxx.test
    R test/unit/objc_finally.m
    R test/unit/objc_finally.result
    R test/unit/objc_finally.test
    M third_party/qsort_arg.h
    M third_party/sptree.h

  Log Message:
  -----------
  C++: replace all Objective C code with C++


  Commit: 17be955e3b446abd214d4a7e0213380d07762655
      
https://github.com/mailru/tarantool/commit/17be955e3b446abd214d4a7e0213380d07762655
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M CMakeLists.txt
    M cfg/warning.c
    M cfg/warning.h
    M client/tarantool_checksum/tc_space.c
    M cmake/compiler.cmake
    M include/assoc.h
    M include/box/box.h
    M include/crc32.h
    M include/errinj.h
    M include/exception.h
    M include/fiber.h
    M include/fio.h
    M include/iobuf.h
    M include/lib/bit/bit.h
    M include/lib/bitset/bitset.h
    M include/lib/bitset/expr.h
    M include/lib/bitset/index.h
    M include/lib/bitset/iterator.h
    M include/mhash.h
    M include/object.h
    M include/palloc.h
    M include/pickle.h
    M include/recovery.h
    M include/replication.h
    M include/rlist.h
    M include/rope.h
    M include/say.h
    A include/scoped_guard.h
    M include/sio.h
    M include/stat.h
    M include/tarantool.h
    M include/tbuf.h
    M include/util.h
    M src/CMakeLists.txt
    A src/admin.cc
    R src/admin.m
    M src/admin.rl
    A src/assoc.cc
    R src/assoc.m
    M src/box/CMakeLists.txt
    A src/box/bitset_index.cc
    M src/box/bitset_index.h
    R src/box/bitset_index.m
    A src/box/box.cc
    R src/box/box.m
    A src/box/box_lua.cc
    R src/box/box_lua.m
    A src/box/box_lua_space.cc
    R src/box/box_lua_space.m
    A src/box/hash_index.cc
    M src/box/hash_index.h
    R src/box/hash_index.m
    A src/box/index.cc
    M src/box/index.h
    R src/box/index.m
    A src/box/port.cc
    R src/box/port.m
    A src/box/request.cc
    R src/box/request.m
    A src/box/space.cc
    M src/box/space.h
    R src/box/space.m
    A src/box/tree_index.cc
    M src/box/tree_index.h
    R src/box/tree_index.m
    A src/box/tuple.cc
    R src/box/tuple.m
    A src/box/txn.cc
    R src/box/txn.m
    A src/coeio.cc
    R src/coeio.m
    A src/coio.cc
    R src/coio.m
    A src/coio_buf.cc
    R src/coio_buf.m
    A src/coro.cc
    R src/coro.m
    A src/cpu_feature.c
    R src/cpu_feature.m
    A src/errinj.cc
    R src/errinj.m
    A src/evio.cc
    R src/evio.m
    A src/exception.cc
    R src/exception.m
    A src/fiber.cc
    R src/fiber.m
    A src/iobuf.cc
    R src/iobuf.m
    A src/ipc.cc
    R src/ipc.m
    A src/iproto.cc
    R src/iproto.m
    M src/lib/bit/CMakeLists.txt
    M src/lib/bit/bit.c
    M src/lib/bitset/index.c
    M src/lib/bitset/page.h
    A src/log_io.cc
    R src/log_io.m
    A src/lua/cjson.cc
    R src/lua/cjson.m
    A src/lua/info.cc
    R src/lua/info.m
    A src/lua/init.cc
    R src/lua/init.m
    A src/lua/lua_ipc.cc
    R src/lua/lua_ipc.m
    A src/lua/lua_socket.cc
    R src/lua/lua_socket.m
    A src/lua/session.cc
    R src/lua/session.m
    A src/lua/slab.cc
    R src/lua/slab.m
    A src/lua/stat.cc
    R src/lua/stat.m
    A src/lua/uuid.cc
    R src/lua/uuid.m
    A src/memcached-grammar.cc
    R src/memcached-grammar.m
    M src/memcached-grammar.rl
    A src/memcached.cc
    R src/memcached.m
    A src/object.cc
    R src/object.m
    A src/opts.c
    A src/palloc.cc
    R src/palloc.m
    A src/pickle.cc
    R src/pickle.m
    A src/recovery.cc
    R src/recovery.m
    A src/replica.cc
    R src/replica.m
    A src/replication.cc
    R src/replication.m
    A src/salloc.cc
    R src/salloc.m
    A src/say.cc
    R src/say.m
    A src/scoped_guard.cc
    A src/session.cc
    R src/session.m
    A src/sio.cc
    R src/sio.m
    A src/stat.cc
    R src/stat.m
    A src/tarantool.cc
    R src/tarantool.m
    A src/tbuf.c
    R src/tbuf.m
    A src/trace.c
    R src/trace.m
    A src/util.c
    R src/util.m
    M test/box/args.result
    M test/unit/CMakeLists.txt
    R test/unit/objc_catchcxx.m
    R test/unit/objc_catchcxx.result
    R test/unit/objc_catchcxx.test
    R test/unit/objc_finally.m
    R test/unit/objc_finally.result
    R test/unit/objc_finally.test
    M third_party/qsort_arg.h
    M third_party/sptree.h

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/cplusplus'

Conflicts:
        src/CMakeLists.txt
        third_party/luajit


  Commit: ad36622a6865faccf918f955b99538ad3eb647e9
      
https://github.com/mailru/tarantool/commit/ad36622a6865faccf918f955b99538ad3eb647e9
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M CMakeLists.txt
    M src/box/box_lua.cc
    M src/fiber.cc
    M src/lua/cjson.cc
    M src/lua/init.cc

  Log Message:
  -----------
  Move to C++: post-merge fixes.


  Commit: ea571b4f451d2f5859539b79fa38ca3bb204e811
      
https://github.com/mailru/tarantool/commit/ea571b4f451d2f5859539b79fa38ca3bb204e811
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    R cmake/BuildLibOBJC.cmake
    R third_party/libobjc/ANNOUNCE
    R third_party/libobjc/ANNOUNCE.1.0
    R third_party/libobjc/ANNOUNCE.1.1
    R third_party/libobjc/ANNOUNCE.1.2
    R third_party/libobjc/ANNOUNCE.1.3
    R third_party/libobjc/ANNOUNCE.1.4
    R third_party/libobjc/ANNOUNCE.1.5
    R third_party/libobjc/ANNOUNCE.1.6
    R third_party/libobjc/ANNOUNCE.1.6.1
    R third_party/libobjc/API
    R third_party/libobjc/COPYING
    R third_party/libobjc/Makefile
    R third_party/libobjc/NSBlocks.m
    R third_party/libobjc/Protocol2.m
    R third_party/libobjc/README
    R third_party/libobjc/abi_version.c
    R third_party/libobjc/alias.h
    R third_party/libobjc/alias_table.c
    R third_party/libobjc/arc.m
    R third_party/libobjc/associate.m
    R third_party/libobjc/block_to_imp.c
    R third_party/libobjc/block_trampolines.S
    R third_party/libobjc/blocks_runtime.h
    R third_party/libobjc/blocks_runtime.m
    R third_party/libobjc/buffer.h
    R third_party/libobjc/build_opts.sh
    R third_party/libobjc/caps.c
    R third_party/libobjc/category.h
    R third_party/libobjc/category_loader.c
    R third_party/libobjc/class.h
    R third_party/libobjc/class_table.c
    R third_party/libobjc/constant_string.h
    R third_party/libobjc/dtable.c
    R third_party/libobjc/dtable.h
    R third_party/libobjc/dwarf_eh.h
    R third_party/libobjc/eh_personality.c
    R third_party/libobjc/encoding2.c
    R third_party/libobjc/gc_boehm.c
    R third_party/libobjc/gc_none.c
    R third_party/libobjc/gc_ops.h
    R third_party/libobjc/hash_table.c
    R third_party/libobjc/hash_table.h
    R third_party/libobjc/hooks.c
    R third_party/libobjc/ivar.c
    R third_party/libobjc/ivar.h
    R third_party/libobjc/legacy_malloc.c
    R third_party/libobjc/loader.c
    R third_party/libobjc/loader.h
    R third_party/libobjc/lock.h
    R third_party/libobjc/method_list.h
    R third_party/libobjc/module.h
    R third_party/libobjc/mutation.m
    R third_party/libobjc/nsobject.h
    R third_party/libobjc/objc/Availability.h
    R third_party/libobjc/objc/Object.h
    R third_party/libobjc/objc/Protocol.h
    R third_party/libobjc/objc/blocks_private.h
    R third_party/libobjc/objc/blocks_runtime.h
    R third_party/libobjc/objc/capabilities.h
    R third_party/libobjc/objc/developer.h
    R third_party/libobjc/objc/encoding.h
    R third_party/libobjc/objc/hooks.h
    R third_party/libobjc/objc/message.h
    R third_party/libobjc/objc/objc-api.h
    R third_party/libobjc/objc/objc-arc.h
    R third_party/libobjc/objc/objc-auto.h
    R third_party/libobjc/objc/objc.h
    R third_party/libobjc/objc/runtime-deprecated.h
    R third_party/libobjc/objc/runtime.h
    R third_party/libobjc/objc/slot.h
    R third_party/libobjc/objc/toydispatch.h
    R third_party/libobjc/objc_msgSend.S
    R third_party/libobjc/objc_msgSend.arm.S
    R third_party/libobjc/objc_msgSend.x86-32.S
    R third_party/libobjc/objc_msgSend.x86-64.S
    R third_party/libobjc/objcxx_eh.cc
    R third_party/libobjc/objcxx_eh.h
    R third_party/libobjc/opts/CMakeLists.txt
    R third_party/libobjc/opts/COPYING
    R third_party/libobjc/opts/ClassIMPCache.cpp
    R third_party/libobjc/opts/ClassLookupCache.cpp
    R third_party/libobjc/opts/ClassMethodInliner.cpp
    R third_party/libobjc/opts/IMPCacher.cpp
    R third_party/libobjc/opts/IMPCacher.h
    R third_party/libobjc/opts/IvarPass.cpp
    R third_party/libobjc/opts/LLVMCompat.h
    R third_party/libobjc/opts/LoopIMPCachePass.cpp
    R third_party/libobjc/opts/ObjectiveCOpts.cpp
    R third_party/libobjc/opts/ObjectiveCOpts.h
    R third_party/libobjc/opts/README
    R third_party/libobjc/opts/TypeFeedback.cpp
    R third_party/libobjc/opts/TypeFeedbackDrivenInliner.cpp
    R third_party/libobjc/opts/TypeInfoProvider.h
    R third_party/libobjc/pool.h
    R third_party/libobjc/properties.h
    R third_party/libobjc/properties.m
    R third_party/libobjc/protocol.c
    R third_party/libobjc/protocol.h
    R third_party/libobjc/runtime.c
    R third_party/libobjc/sarray2.c
    R third_party/libobjc/sarray2.h
    R third_party/libobjc/selector.h
    R third_party/libobjc/selector_table.c
    R third_party/libobjc/sendmsg2.c
    R third_party/libobjc/slot_pool.h
    R third_party/libobjc/spinlock.h
    R third_party/libobjc/statics_loader.c
    R third_party/libobjc/string_hash.h
    R third_party/libobjc/toydispatch.c
    R third_party/libobjc/type_encoding_cases.h
    R third_party/libobjc/unistd.h
    R third_party/libobjc/unwind-arm.h
    R third_party/libobjc/unwind-itanium.h
    R third_party/libobjc/unwind.h
    R third_party/libobjc/visibility.h

  Log Message:
  -----------
  Remove libobjc.


  Commit: e044aafb92b59063f23efc3a3982b91c745128ff
      
https://github.com/mailru/tarantool/commit/e044aafb92b59063f23efc3a3982b91c745128ff
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M README.md
    M cmake/compiler.cmake
    M doc/user/tutorial.xml

  Log Message:
  -----------
  Remove references to Objective C.


Compare: https://github.com/mailru/tarantool/compare/0e24d55bcd23...e044aafb92b5
_______________________________________________
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