1
0
Fork 0
Commit Graph

18502 Commits

Author SHA1 Message Date
Jan Steemann 1e83716c1d removed debug output 2014-12-13 12:48:09 +01:00
Jan Steemann e4686bcc1b reverted non-fix 2014-12-13 12:44:24 +01:00
Willi Goesgens b275c79793 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js
2014-12-13 00:20:09 +01:00
Willi Goesgens f3c13f7c38 Fix unittest. 2014-12-13 00:13:00 +01:00
Jan Steemann ff2ddd3133 fixed tests 2014-12-12 23:34:28 +01:00
Jan Steemann 44a5db257d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 23:02:42 +01:00
Jan Steemann f4d7a57c19 changed `COLLECT...INTO x COUNT` to `COLLECT...WITH COUNT INTO x`
allow executing subqueries without double brackets

jslint
2014-12-12 23:02:24 +01:00
Willi Goesgens daeb46893f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 21:40:35 +01:00
Willi Goesgens 115f226385 Optimizer: Enable removing of filternodes if the index can handle the filter condition. 2014-12-12 21:39:35 +01:00
Tomas Bosak 32bc422ad5 Improve edge API docs.
- create edge operation with 202 result is returned when waitForSync was
set to false
- add missing If-None-Match header parameter description to read head
operation
- add information about _key attribute in result for replace, update and
delete operations
2014-12-12 17:33:30 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
Heiko Kernbach c181bc7d9f issue: #1168 2014-12-12 11:05:26 +01:00
Heiko Kernbach e855e0faeb issue: #1161 fixed 2014-12-12 10:52:08 +01:00
Alan Plum 7cf115f321 Merge pull request #1176 from stackmagic/foxx-repo-any
repository.any()
2014-12-11 13:17:08 +01:00
Jan Steemann 9b15228676 fixed broken documentation 2014-12-11 12:30:41 +01:00
Jan Steemann dff7166dbc Merge pull request #1178 from yojimbo87/devel
Add 'mergeObjects' description to edge API docs.
2014-12-11 00:59:07 +01:00
Tomas Bosak 953d5efa7a Add 'mergeObjects' description to edge API docs.
Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
2014-12-10 23:24:32 +01:00
Patrick Huber 3692c23474 fixes from feedback 2014-12-10 22:05:06 +01:00
Lucas Dohmen 0013e56573 Merge pull request #1177 from triAGENS/fix-user-app
Fix bug in the user app's storage
2014-12-10 16:55:27 +01:00
Lucas Dohmen a3a566bc87 Fix bug in the user app's storage 2014-12-10 15:14:43 +01:00
Patrick Huber d0eb69fc73 expose the any() method from the collection on the repository too 2014-12-10 14:19:06 +01:00
James 7ab57d64ec Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 22:05:57 +00:00
Jan Steemann 22928c1bb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
2014-12-09 22:45:55 +01:00
James 3ce7164fb6 finally working again, and more tests 2014-12-09 20:15:38 +00:00
Jan Steemann 959631c4d9 issue #1173: AQL Editor "Save current query" resets user password
Conflicts:
	CHANGELOG
2014-12-09 20:52:51 +01:00
Jan Steemann a86cf09f7f issue #1173: AQL Editor "Save current query" resets user password
Conflicts:
	CHANGELOG
2014-12-09 20:50:18 +01:00
James 8601dd4424 working again 2014-12-09 16:54:34 +00:00
James 35be017bb3 snapshot 2014-12-09 16:44:02 +00:00
Jan Steemann 5c9e52ea20 pass query parameters 2014-12-09 17:16:03 +01:00
Jan Steemann f1f0269eb9 issue #1159: allow --server.request-timeout and --server.connect-timeout of 0 2014-12-09 16:51:08 +01:00
Jan Steemann 1fdf74e09e jslint 2014-12-09 16:44:31 +01:00
Max Neunhoeffer 4320142437 Fix for #1147 into CHANGELOG. 2014-12-09 16:34:00 +01:00
Max Neunhoeffer 1d38ca4b56 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-09 16:33:15 +01:00
Max Neunhoeffer 17f9c83540 Fix issue #1147, must encode dispatcher ID for etcd. 2014-12-09 16:32:37 +01:00
Jan Steemann ce39cf0ed7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-09 16:27:20 +01:00
Jan Steemann 6aaa5f05a4 nullptr 2014-12-09 16:27:14 +01:00
Jan Steemann 2fbc53f711 fixed potential leaks 2014-12-09 16:27:05 +01:00
Thomas Schmidts 8cad959ad6 Merge pull request #1172 from stackmagic/shameless
reference ansible role on ansible galaxy
2014-12-09 15:41:33 +01:00
Max Neunhoeffer be421d926f Add new test for use-index-range rule and no rule explosion. 2014-12-09 15:40:22 +01:00
James 4fdd97c9a7 fixed another bug 2014-12-09 14:19:52 +00:00
Jan Steemann d638c1c0c9 fixed choicung 2014-12-09 15:18:53 +01:00
Jan Steemann a617dcffc5 added tests 2014-12-09 14:50:28 +01:00
Patrick Huber 07214a41b7 reference ansible role on ansible galaxy 2014-12-09 14:12:36 +01:00
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