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

2396 Commits

Author SHA1 Message Date
Jan Steemann 5166dc72d2 jslint 2016-03-24 19:32:31 +01:00
Jan Steemann c7daf1531d Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:23:11 +01:00
Michael Hackstein 582be9e707 Fixed usage of replace in graph-blueprints 2016-03-24 17:10:01 +01:00
Jan Steemann 881761d2d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:05:43 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Andreas Streichardt 3f9f03bb38 Remove debug 2016-03-24 14:26:12 +01:00
Jan Steemann d763c102d6 fulltext fixes 2016-03-22 18:34:40 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
Jan Steemann 31d9c1873a fixed test 2016-03-21 18:03:49 +01:00
Jan Steemann f0724447b6 fixed sparse index test 2016-03-21 17:08:42 +01:00
jsteemann 82a1c58429 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 11:03:54 +01:00
Frank Celler def5b35a84 jslint fixes 2016-03-18 11:02:42 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Andreas Streichardt 14ce41435b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-17 22:40:00 +00:00
Andreas Streichardt 90862b6081 Proper secondary => Primary failover 2016-03-17 22:39:15 +00:00
jsteemann c175d03433 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 23:14:53 +01:00
jsteemann ba9b318a7f don't issue two warnings 2016-03-17 23:13:50 +01:00
jsteemann 333bda5df1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 14:51:08 +01:00
Frank Celler cd1b2b6fc3 moved script 2016-03-16 13:01:41 +01:00
Frank Celler d9f9b8b65d fixed server version 2016-03-16 13:01:18 +01:00
Jan Steemann 6d6d2e9e9c do not set useless bind parameters 2016-03-11 19:42:14 +01:00
Jan Steemann 273deddaee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 19:11:58 +01:00
Andreas Streichardt b29c437b7f Add more error info 2016-03-11 18:22:12 +01:00
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00
Jan Steemann 4d4ee7e237 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 16:25:15 +01:00
Jan Steemann ba637faea0 do not compare execution times 2016-03-07 11:33:20 +01:00
Jan Steemann e0e84b7ea1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:50:48 +01:00
Frank Celler 0d13d6609a renamed to _frontend 2016-03-01 11:25:07 +01:00
Jan Steemann ce31d754e4 fixed typo 2016-02-26 12:33:08 +01:00
Alan Plum 14cba16385 Linting 2016-02-15 23:29:23 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Max Neunhoeffer 0902edc257 Fix jslint error. 2016-02-15 20:50:12 +01:00
Max Neunhoeffer 9d3446afe5 Stop WAL collection before synchronization of shard. 2016-02-15 10:29:06 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Max Neunhoeffer 8b98ae5ef5 Snapshot for merging. 2016-02-11 09:11:00 +01:00
Jan Steemann 85315ce9db added quantifiers test 2016-02-10 15:20:41 +01:00
Alan Plum a5dd99d4a7 Fix db._modules based routing 2016-02-10 14:44:21 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Max Neunhoeffer 88c2657af7 Merge branch 'devel' into ClustUp2 2016-02-10 08:38:37 +01:00
Alan Plum 7dbc89d7be Actually register static Foxx model events 
Fixes #1665.
 2016-02-09 16:50:45 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Jan Steemann 040b09f303 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-05 19:47:29 +01:00
Jan Steemann 45f416dae3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:31:17 +01:00
Andreas Streichardt a0df762a42 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 18:30:43 +01:00
Frank Celler 4264fae2ab fixed valgrind for testing 2016-02-05 18:22:26 +01:00
Jan Steemann 99b79acb61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:20:32 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Andreas Streichardt 111050871e Fix jslint 2016-02-05 17:23:35 +01:00
Andreas Streichardt 8075cdc30f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 14:25:45 +01:00