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

28780 Commits

Author SHA1 Message Date
Michael Hackstein 1eb1e0ee0c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:08:21 +02:00
Michael Hackstein 7455347263 Start Local cluster will now fail if upgrading and bootstrapping fails 2016-04-19 17:08:16 +02:00
Michael Hackstein 2c246c860c Fixed a bug in general-graph module. It was possible to create a graph using document collections for relations. This did lead into undefined behaviour. 2016-04-19 17:07:18 +02:00
Jan Steemann 83974b36fa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:57:52 +02:00
Jan Steemann b4e876e282 prefer explicit options over positional argument 2016-04-19 16:57:26 +02:00
Andreas Streichardt f41d9c41c4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:50:36 +02:00
Andreas Streichardt 30b71d0423 Wait 5ms when connection needs to be reestablished 2016-04-19 16:49: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
hkernbach 3d94293e3c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:33:28 +02:00
hkernbach bcbaa7bc72 modified nodes view 2016-04-19 16:33:17 +02:00
Alan Plum 8373c04c1a
Just no 2016-04-19 16:18:18 +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 e592bc0480 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:12:42 +02:00
Alan Plum 64289b3895
I Shall Exterminate Everything Around Me 2016-04-19 16:12:19 +02:00
Jan Steemann b057d02396 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:09:23 +02:00
Jan Steemann be2ec7b9fc don't access allocatorThread when it's already destroyed 2016-04-19 16:08:32 +02:00
hkernbach 5c17f3a230 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:08:28 +02:00
hkernbach 668795dd41 removed no longer required files 2016-04-19 16:08:14 +02:00
hkernbach 9ac9331072 nodes view 2016-04-19 16:05:29 +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
Alan Plum 7ff989687c
Rebuild aardvark 2016-04-19 15:06:56 +02:00
Alan Plum 4c3319de25
Extract session storage.save 
Also fix transports
 2016-04-19 15:06:55 +02:00
Max Neunhoeffer f3e47db5d8 Add a dumpAgency script. 2016-04-19 14:51:17 +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
Max Neunhoeffer 65e66b92a7 Add startAgency script. 2016-04-19 14:43:53 +02:00
Max Neunhoeffer 4beb3deac8 New agency test. 2016-04-19 14:43:35 +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 8447842227 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 14:32:32 +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
Alan Plum d0ce74803c
Make sure session exists before checking it in aardvark 2016-04-19 13:58:50 +02:00
Jan Steemann 386fee8099 updated vpack library 2016-04-19 13:44:53 +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
hkernbach 2bd9dfea61 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 13:16:44 +02:00
hkernbach 179e5ee7a5 scss, views 2016-04-19 13:15:16 +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 d3dfaab906 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 08:00:00 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00