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

13156 Commits

Author SHA1 Message Date
Jan Steemann dc742f255a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:37 +02:00
Jan Steemann 01a4c43b81 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:23 +02:00
Jan Steemann cf099a629b dump markers 2014-05-22 10:52:12 +02:00
gschwab c820c8b264 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 10:41:42 +02:00
gschwab 0d25c94b62 graph._drop does not anymore drop collections used in other graphs 2014-05-22 10:41:38 +02:00
Michael Hackstein b1cdeca44c Further refactoring, another suite now based on variables and prefixed with UnitTests 2014-05-22 10:39:12 +02:00
Michael Hackstein e345129987 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 10:36:31 +02:00
Michael Hackstein 2aaca2fa0b Further refactoring fpr general graph 2014-05-22 10:36:27 +02:00
Thomas Schmidts 4d76ff399e issue #867: added declaration for several methods 2014-05-22 10:20:01 +02:00
Max Neunhoeffer 2820afdcc2 Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Michael Hackstein 1dfdcca97c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-05-22 09:53:40 +02:00
Michael Hackstein 597c2e9416 Further refactoring of test for general-graph 2014-05-22 09:52:48 +02:00
Michael Hackstein 51f523525c Started test refactoring for general-graph, uses parameters now whenever possible 2014-05-22 09:48:42 +02:00
gschwab d29ebfaa3b fixed tests 2014-05-22 09:32:21 +02:00
gschwab 56f0576f99 implemented _extendEdgeDefinitions() 2014-05-22 09:05:47 +02:00
gschwab c0a7aa2d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 08:32:37 +02:00
gschwab 3947574805 renamed edgeDefinitions -> _edgeDefinitions 2014-05-22 08:32:34 +02:00
Michael Hackstein 5c1a6836e2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 18:22:48 +02:00
Michael Hackstein 75d5a04ae7 Embedded cursors into fluent AQL interface for graphs. 2014-05-21 18:22:30 +02:00
Jan Steemann 06a56a7d36 removed MRuby for arangod 2014-05-21 18:11:59 +02:00
Frank Celler 549368e166 fixed example generation process 2014-05-21 18:09:10 +02:00
Jan Steemann 5373f1cea0 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/edge-collection.h
 2014-05-21 18:06:44 +02:00
Jan Steemann 0caa570274 update() 2014-05-21 18:05:08 +02:00
Michael Hackstein bf89abb737 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 17:34:08 +02:00
Michael Hackstein 852c4da742 Added an example for Example generation in code to general graph module 2014-05-21 17:34:03 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer 726198007c Do not use linenoise with cmake under non-Windows. 2014-05-21 16:10:53 +02:00
Max Neunhoeffer c913f3a4c7 Fix lib/CMakeLists.txt 2014-05-21 15:59:04 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Jan Steemann 0f3590315c Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 15:00:41 +02:00
Max Neunhoeffer 792b6d4458 Repair C++ version of program-options.c 2014-05-21 15:00:06 +02:00
Jan Steemann e67f130f70 removed debug output 2014-05-21 14:53:15 +02:00
Max Neunhoeffer 50783b36c8 program-options.c -> program-options.cpp 2014-05-21 14:50:52 +02:00
Max Neunhoeffer 9d947dcc9d Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 14:47:04 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Thomas Schmidts 166d010b35 added declaration in update vertex 2014-05-21 14:25:21 +02:00
Jan Steemann 2d725da543 fixed document removal 2014-05-21 14:22:30 +02:00
Jan Steemann a10fbf36ae Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 14:18:14 +02:00
Jan Steemann c38de677d0 cleaned up WAL markers 2014-05-21 14:17:58 +02:00
Max Neunhoeffer aa731f5eb0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 13:57:26 +02:00
Max Neunhoeffer 77025348df Make JsonParser C++, however, functions still extern "C". 2014-05-21 13:56:45 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann 0933555a3e fixed saving of documents 2014-05-21 13:41:55 +02:00
Esteban Lombeyda 4af97257b9 Buf fix: Java Script Syntax error 2014-05-21 12:51:25 +02:00
Jan Steemann 74aa2d6cee fixed compile error 2014-05-21 12:46:08 +02:00
Max Neunhoeffer 2f1dece99b Add missing file. 2014-05-21 12:43:58 +02:00
Esteban Lombeyda 32aee78f7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 11:53:34 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
Max Neunhoeffer 9d948618f3 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 11:31:08 +02:00
Max Neunhoeffer 147e829754 Ahuacatl is now C++ and compiles again. 2014-05-21 11:30:44 +02:00