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

9138 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann a5bbb8d084 allow using a few more bytes for indexed slice values 2016-04-19 23:34:39 +02:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
jsteemann a3b154043e removed unused typedef 2016-04-19 22:31:12 +02:00
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
Kaveh Vahedipour 0ed4c912b4 some wrong header declarations 2016-04-19 13:11:42 +00: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
Kaveh Vahedipour 5eed7c8b44 some wrong header declarations 2016-04-19 12:15:20 +00: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 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00: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
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Frank Celler f85c700d20 silence some warnings 2016-04-19 07:35:03 +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