Commits · 334a6fe59c46d42d758fdf34c20bb93d295eb919 · core / tarantool · GitLab

Snippets Groups Projects

Aug 15, 2014
- Merge branch 'master' of github.com:tarantool/tarantool · 334a6fe5
  Konstantin Osipov authored 10 years ago
  
  334a6fe5
- Update a status message ("client" -> "replica") · edc8a1a8
  Konstantin Osipov authored 10 years ago
  
  edc8a1a8
- fix gh-366 duplicate output · 0f53c82c
  Alexandr authored 10 years ago
  
  0f53c82c
- Merge branch 'stable' · ec2c41ae
  bigbes authored 10 years ago
  
  Conflicts: extra/rpm/tarantool.rpm.spec.in
  ec2c41ae
- Fix SCL Spec · 509d8074
  bigbes authored 10 years ago
  
  509d8074
Aug 14, 2014
- Merge branch 'ocelot-master' · 033ed691
  Konstantin Osipov authored 10 years ago
  
  033ed691
- Merge branch 'master' of github.com:tarantool/tarantool · 0900b29d
  Konstantin Osipov authored 10 years ago
  
  0900b29d
- Merge remote-tracking branch 'origin/master' into fiber-file-io · 932d8b82
  Konstantin Osipov authored 10 years ago
  
  932d8b82
- 'fio' (cooperative file I/O) package: style fixes · e5cf6894
  Konstantin Osipov authored 10 years ago
  
  Add comments, renames.
  e5cf6894
- Merge remote-tracking branch 'origin/master' · 1c6f983d
  Roman Tsisyk authored 10 years ago
  
  Conflicts: test/box/fiber.result test/box/fiber.test.lua
  1c6f983d
- Merge branch 'stable' · 70cec2af
  Roman Tsisyk authored 10 years ago
  
  Conflicts: test/box/bsdsocket.result test/box/bsdsocket.test
  70cec2af
- Merge remote-tracking branch 'origin/stable' · af94d2ab
  Konstantin Osipov authored 10 years ago
  
  Conflicts: test/box/fiber.result test/box/fiber.test
  af94d2ab
- Merge remote-tracking branch 'origin/stable' · 4983f774
  Roman Tsisyk authored 10 years ago
  
  Conflicts: test/box/fiber.result test/box/fiber.test
  4983f774
- Merge remote-tracking branch 'origin/gh-424-socket-readline' into stable · efafa811
  Roman Tsisyk authored 10 years ago
  
  efafa811
- Merge remote-tracking branch 'origin/gh-429-replication-crash-background' · 4e31936e
  Konstantin Osipov authored 10 years ago
  
  4e31936e
Aug 13, 2014
- Rename dfio to coeio_file. · a91a418c
  Dmitry E. Oboukhov authored 10 years ago
  
  a91a418c
Aug 12, 2014
- spell check and link check · 260f51ab
  ocelot-inc authored 10 years ago
  
  260f51ab
- Don't use static variables. · ccd1b286
  Dmitry E. Oboukhov authored 10 years ago
  
  ccd1b286
- Cleanup code. · a85c00d7
  Dmitry E. Oboukhov authored 10 years ago
  
  a85c00d7
Aug 11, 2014
- Merge branch 'master' of github.com:tarantool/tarantool into fiber-file-io · 97db4336
  Dmitry E. Oboukhov authored 10 years ago
  
  97db4336
- fiber-io tests. · b9616280
  Dmitry E. Oboukhov authored 10 years ago
  
  b9616280
- Merge branch 'master' of https://github.com/tarantool/tarantool · 44538cef
  ocelot-inc authored 10 years ago
  
  44538cef
- Fix #424: Merge socket:read() and socket:readline() · ca1f738c
  Roman Tsisyk authored 10 years ago
  
  ca1f738c
- Add explicit box.rollback() in test for gh-431. · ab4122b5
  Dmitry Simonenko authored 10 years ago
  
  ab4122b5
- fix gh-404 gcc 4.9 warning · 44032f5c
  Alexandr authored 10 years ago
  
  44032f5c
Aug 09, 2014
- Merge branch 'master' of github.com:mailru/tarantool · 95a30b3e
  Dmitry Simonenko authored 10 years ago
  
  95a30b3e
- Fix gh-431: sophia: assertion if box.begin. · 9bf40ca8
  Dmitry Simonenko authored 10 years ago
  
  9bf40ca8
Aug 08, 2014
- 'session' is now 'box.session' · aadb557e
  ocelot-inc authored 10 years ago
  
  aadb557e
- adjustments due to email from r. tsisyk · c9b27426
  ocelot-inc authored 10 years ago
  
  c9b27426
- Merge branch 'master' of https://github.com/tarantool/tarantool · 54f76714
  ocelot-inc authored 10 years ago
  
  54f76714
- fix gh-430 make clean kills ./src/uri.cc · c3382a75
  Alexandr authored 10 years ago
  
  c3382a75
- sophia index: fix for 'crash if insert without index'. · ea4b7046
  Dmitry Simonenko authored 10 years ago
  
  closes #gh-280.
  ea4b7046
- implement sophia index drop. · 55a1f6ba
  Dmitry Simonenko authored 10 years ago
  
  closes #gh-238.
  55a1f6ba
- sophia: submodule update (buildbot related) · cbfd119e
  Dmitry Simonenko authored 10 years ago
  
  cbfd119e
- Fix #429: Replication relay crash with background=true · 0a1780cb
  Roman Tsisyk authored 10 years ago
  
  0a1780cb
Aug 07, 2014
- Merge branch 'master' of https://github.com/tarantool/tarantool · 95435d4b
  ocelot-inc authored 10 years ago
  
  95435d4b
- Merge remote-tracking branch 'origin/sophia-update' · 4f5efae5
  Konstantin Osipov authored 10 years ago
  
  Conflicts: src/box/box.cc
  4f5efae5
Aug 06, 2014
- Merge branch 'master' of https://github.com/tarantool/tarantool · 8a8f698a
  ocelot-inc authored 10 years ago
  
  8a8f698a
- Fix #420: fiber.cancel() assertion `!(f->flags & (1 << 2))' failed · ebcf369a
  Roman Tsisyk authored 10 years ago
  
  ebcf369a
- Merge branch 'master' of github.com:tarantool/tarantool into fiber-file-io · 3d18b0c4
  Dmitry E. Oboukhov authored 10 years ago
  
  Conflicts: src/CMakeLists.txt
  3d18b0c4