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

18459 Commits

Author SHA1 Message Date
James afb960f60e fixed another bug and added a test for it. 2014-12-09 11:19:34 +00:00
James a4dcf1b9d3 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 10:23:07 +00:00
James 8871612eb8 adding tests for last 2014-12-09 10:22:15 +00:00
James 1467b34c5e fixing duplicates in dynamic bounds 2014-12-09 10:19:01 +00:00
Jan Steemann 81997d38b0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-09 11:02:11 +01:00
Jan Steemann 797b6dbf75 added index tests 2014-12-09 11:01:58 +01:00
Jan Steemann de9031ca1f Merge pull request #1171 from yojimbo87/devel 
Update document API description.
 2014-12-09 10:55:32 +01:00
Tomas Bosak d0b041842a Update document API description. 
Include information about _key attribute which is also returned along
with _id and _rev for replace, update and delete document operations.
 2014-12-09 10:50:06 +01:00
James 46fe461ca1 fixed bug and added test for it. 2014-12-09 09:40:40 +00:00
Max Neunhoeffer 2d810c27b2 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-09 09:59:23 +01:00
Max Neunhoeffer 368530dd5a Fix number of plan cap. 2014-12-09 09:59:07 +01:00
Jan Steemann c42bd744ba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-09 09:47:43 +01:00
Jan Steemann 6ddaf08ccb fixed potential memleak 2014-12-09 09:47:28 +01:00
Thomas Schmidts 9e4e8cb099 Fixed 1141. Added note to the documentation about headers in FoxxController.mdpp 2014-12-08 17:04:59 +01:00
Max Neunhoeffer 62f03aa013 Choose skiplistIndex if in doubt. 2014-12-08 16:53:05 +01:00
Max Neunhoeffer f6324dd9ec Fix a comment. 2014-12-08 16:12:40 +01:00
Max Neunhoeffer 0ccb6dd48c Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-08 15:37:37 +01:00
Max Neunhoeffer fc79c31661 More sensible plan management in useIndexRangeNode optimizer rule. 2014-12-08 15:37:01 +01:00
Jan Steemann 399e93c3ff issue #1155: allow bind parameter for sort order 
SORT what @order is now allowed
 2014-12-08 13:05:40 +01:00
Jan Steemann 5d9c8ef49a removed compile warnings 2014-12-08 12:54:44 +01:00
Jan Steemann cd17c393ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
 2014-12-08 12:37:13 +01:00
Jan Steemann d5ec9ca4bb jslint 2014-12-08 11:50:14 +01:00
Jan Steemann f274de088f updated CHANGELOG 2014-12-08 11:48:02 +01:00
Jan Steemann db507fe3f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:34:02 +01:00
Jan Steemann 63ceb0d1e0 added tests for mergeObjects 2014-12-08 11:33:54 +01:00
Max Neunhoeffer 10580f1401 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:30:21 +01:00
Max Neunhoeffer 32c6262586 Switch off importing test in the cluster because feature not yet implemented. 2014-12-08 11:27:19 +01:00
Jan Steemann a018ccaed7 added derived file 2014-12-08 11:23:53 +01:00
Jan Steemann 23203a5437 indenting 2014-12-08 11:23:45 +01:00
Jan Steemann b4a0443da7 fixed default behavior of merge 2014-12-08 11:23:05 +01:00
Jan Steemann 327c10264d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:00:38 +01:00
Jan Steemann 12c155636a updated docs for mergeObjects 2014-12-08 11:00:31 +01:00
scottashton c657790bc4 cleaned up example for getConnectingEdges 2014-12-08 10:58:59 +01:00
Jan Steemann 4912cbe9fe updated AQB version 2014-12-08 10:22:20 +01:00
Jan Steemann ddbecce489 Merge pull request #1167 from stackmagic/docmake 
Doc Makefile tweaks
 2014-12-08 09:59:02 +01:00
James dca2cc0c34 some further cleaning up 2014-12-06 20:44:56 +00:00
James b2ec5d6f1b more cleaning up 2014-12-06 20:25:14 +00:00
James 53c32616dc removing redundant files 2014-12-06 19:43:24 +00:00
James 37e059fb7a cleaning up 2014-12-06 19:40:04 +00:00
James 62411fa64a another memleak plugged 2014-12-06 19:24:47 +00:00
James ad211c83a5 memleaks 2014-12-06 19:01:16 +00:00
James 454ef10898 fixing last 2014-12-06 16:21:59 +00:00
James bf4b718019 memleaks 2014-12-06 16:18:39 +00:00
James 6e47660ff7 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-06 15:41:34 +00:00
James a4c7c4edcd tests for index-or and in 2014-12-06 15:27:20 +00:00
James aaacbcf9bb Jan's other patch 2014-12-06 14:23:13 +00:00
James f0bb73982c whitespace 2014-12-06 14:22:52 +00:00
James 8698a1da3d fixing bugs and updating tests 2014-12-06 14:02:50 +00:00
James caaa9435b9 cleaning up 2014-12-06 13:04:50 +00:00
James 08ffbb9638 snapshot 2014-12-06 11:09:32 +00:00