Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,696 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

9093 Commits

Author SHA1 Message Date
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt c738773f22 Include guards instead of #pragma once 2016-04-19 17:40:51 +02:00
Jan Steemann 0088fa2cbb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:38:55 +02:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
Max Neunhoeffer 1e6b346db7 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 16:17:57 +02:00
Max Neunhoeffer 2bfe7b8b24 Finishing touches to performRequests. 2016-04-19 16:17:41 +02:00
Jan Steemann be2ec7b9fc don't access allocatorThread when it's already destroyed 2016-04-19 16:08:32 +02:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Max Neunhoeffer 4382ac89d1 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 15:41:04 +02:00
Max Neunhoeffer ed41c310c1 Fix synchronous replication. 2016-04-19 15:40:51 +02:00
Max Neunhoeffer d1bea93518 Fix too short timeout in server shutdown /Current/Lock in agency. 2016-04-19 15:40:19 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Max Neunhoeffer 5c232edee2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 14:44:35 +02:00
Max Neunhoeffer 0d1a7239c1 Bugfixes for synchronous replication. 2016-04-19 14:44:23 +02:00
Michael Hackstein 7e6fd1561e Reverted usage of externals in Graph Functions. Commit was to early. Still warting for transparent handling of externals in VelocyPack 2016-04-19 14:42:17 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Max Neunhoeffer 9e43206513 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 13:25:31 +02:00
Jan Steemann 32082e30f0 use move 2016-04-19 13:20:13 +02:00
Michael Hackstein 36e608a5fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 12:32:54 +02:00
Michael Hackstein cf737639ba V8Traverser now uses externals in Slices instead of direct documents 2016-04-19 12:30:50 +02:00
Kaveh Vahedipour 2435dcc71b Outsourced config_t 2016-04-19 08:29:07 +00:00
Kaveh Vahedipour 2c1f9efc3b Outsourced config_t 2016-04-19 08:21:40 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00:00
Max Neunhoeffer 168f3e0e7a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 08:55:11 +02:00
Kaveh Vahedipour 96ee5b6b60 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 08:41:08 +02:00
Kaveh Vahedipour 934b7ca107 cppcheck warnings 2016-04-19 08:40:56 +02:00
jsteemann 9eb3036c2e fixed typo 2016-04-18 22:40:15 +02:00
Max Neunhoeffer dc7f855cfc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 19:59:22 +02:00
Simran Brucherseifer 097dcb0984 Minor corrections 2016-04-18 19:01:56 +02:00
Jan Steemann f686188d5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 18:11:36 +02:00
Jan Steemann aaf6176347 remove useless checks 2016-04-18 18:11:28 +02:00
Michael Hackstein 22b6f3f7b0 CPPCheck improvements 2016-04-18 17:36:02 +02:00
Max Neunhoeffer 16769c59b4 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 16:24:28 +02:00
Kaveh Vahedipour 114b643d6e cluster startup and supervision 2016-04-18 16:13:30 +02:00
Kaveh Vahedipour 313140e0e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:27:31 +02:00
Kaveh Vahedipour 3cf55c5e3e cluster startup and supervision 2016-04-18 15:27:23 +02:00
Jan Steemann 881f13e13b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:09:50 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
Max Neunhoeffer 7a8daa35cb Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 13:47:38 +02:00
Max Neunhoeffer e9f2276f0c Finish insert case of synchronous replication. 2016-04-18 13:47:20 +02:00
Michael Hackstein 94ee7b41f8 Removed unneccessary warning 2016-04-18 13:44:11 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Kaveh Vahedipour 6ae8aa7c0d replace sleep_for with wait 2016-04-18 10:46:26 +02:00
Michael Hackstein 930b7216b1 Fixed a bug in ClusterTraverser. Moved a string too early 2016-04-18 09:29:46 +02:00
jsteemann a0f05f584f speed up IN lookups on ranges 2016-04-17 21:09:36 +02:00
jsteemann 30ec73e596 AQL bugfixes and tests, CHANGELOG updates 2016-04-17 20:57:13 +02:00