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

2815 Commits

Author SHA1 Message Date
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
Max Neunhoeffer 786ea250ba Snapshot. 2014-05-21 11:20:03 +02:00
Jan Steemann b10ef2335c split Marker.h 2014-05-21 10:28:24 +02:00
Max Neunhoeffer fdba62a957 Implement TRI_EXTRACT_SHAPED_JSON_MARKER as static inline. 
Also consider WAL.
 2014-05-21 08:59:03 +02:00
Max Neunhoeffer 2cdcd24a59 First step to move ahuacatl to C++ 2014-05-21 08:58:49 +02:00
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
 2014-05-20 17:03:49 +02:00
Jan Steemann 4529560ad2 adding edges 2014-05-20 16:58:05 +02:00
scottashton 88e8ea849f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 16:45:27 +02:00
scottashton a8cacef57d added GRAPH_NEIGHBORS 2014-05-20 16:45:22 +02:00
Jan Steemann 7151aee16e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 16:16:30 +02:00
Jan Steemann c14b3888f0 removed unused defines 2014-05-20 16:16:22 +02:00
scottashton c99ce5167d traversal aql 2014-05-20 15:55:07 +02:00
Jan Steemann b20240b829 added legend 2014-05-20 14:37:57 +02:00
Jan Steemann 22e0290b06 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 14:21:20 +02:00
Jan Steemann cdad1f19fe moved marker definitions 2014-05-20 14:21:12 +02:00
Max Neunhoeffer b5df264cdb First draft of legend generator. 2014-05-20 13:27:09 +02:00
Max Neunhoeffer 464b6720ca Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:10 +02:00
Jan Steemann 029b7333ba added remove marker struct 2014-05-20 13:17:01 +02:00
Jan Steemann 57753f84dd added new structs for WAL documents and edges 2014-05-20 11:49:12 +02:00
Jan Steemann 52be779997 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:40:19 +02:00
Jan Steemann c9e49c5446 reverted struct change 2014-05-20 11:39:15 +02:00
Jan Steemann 6ecfc44f11 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
Jan Steemann c93871166a added save() method, still broken 2014-05-20 11:31:42 +02:00
Jan Steemann 8879e27738 removed unused struct 2014-05-20 11:30:02 +02:00
Jan Steemann f7797ab6c9 added locker objects 2014-05-20 11:22:27 +02:00
Max Neunhoeffer 9910599d8d Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 08:41:51 +02:00
Jan Steemann af7992fad7 extended markers 2014-05-19 18:01:54 +02:00
Jan Steemann b06e89da54 simplified 2014-05-19 17:44:56 +02:00
scottashton 0f68fa982d fixed bug in edges 2014-05-19 16:42:30 +02:00
Jan Steemann 59aa16de0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 15:50:19 +02:00
Jan Steemann 931ba36daf write transaction markers into WAL 2014-05-19 15:49:58 +02:00
scottashton 35b34e4804 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 15:28:16 +02:00
scottashton 256868bdc2 aql function edges 2014-05-19 15:28:05 +02:00
Jan Steemann 3b8d282c7b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 11:55:27 +02:00
Jan Steemann cdb4eaff99 fixed conversion warning 2014-05-19 11:31:40 +02:00
Jan Steemann 1de19b7b0e deactivated files 2014-05-19 11:25:01 +02:00
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
 2014-05-19 11:21:58 +02:00
Max Neunhoeffer 72b923325a First draft of legend generator. 2014-05-18 15:53:30 +02:00
Jan Steemann 1328aed652 small refactoring 2014-05-17 12:17:58 +02:00
Jan Steemann 73ca0bee87 use bigger initial buffer 2014-05-17 11:15:36 +02:00
Jan Steemann e9c4a759f7 add string length to object creation 2014-05-17 01:37:36 +02:00
Jan Steemann d16535351a reserve space in result vector 2014-05-17 00:49:52 +02:00
Jan Steemann b811d21fad issue #862: added `--overwrite` option for arangoimp 2014-05-16 21:29:20 +02:00
Jan Steemann d5200f26d7 moved magic number to function 2014-05-16 19:05:54 +02:00
Jan Steemann 6da081474c explicitly name test cases 2014-05-16 18:38:53 +02:00
scottashton db29d7bc2c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-15 10:33:25 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann 579a46220e added one-shot tasks 2014-05-14 21:04:37 +02:00