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

3689 Commits

Author SHA1 Message Date
Jan Steemann 3cf1b237ee dfdb improvements 2015-10-23 19:03:24 +02:00
Jan Steemann ad068ce49f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-23 17:23:11 +02:00
Max Neunhoeffer e6a81de395 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-10-23 16:45:37 +02:00
Max Neunhoeffer cc45a0d352 Implement role switching. 2015-10-23 16:45:21 +02:00
Jan Steemann 025e470e3b added a single-array parameter variant for the AQL MERGE function 2015-10-23 15:29:53 +02:00
Jan Steemann 606213c1e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-23 12:54:47 +02:00
Jan Steemann f457f3c89a remove unuseful test 2015-10-23 12:54:34 +02:00
Michael Hackstein 0a175a4271 Removed getOne in SimpleAttribute Matcher. All of the attributes are in sorted order rendering getOne and getAny useless 2015-10-23 12:49:57 +02:00
Michael Hackstein c4b0b21c74 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-22 17:13:18 +02:00
Michael Hackstein efd0ba0618 Removed a test for nested array indexes. We still need a decission there 2015-10-22 17:13:07 +02:00
Michael Hackstein b18d947492 Fixed jslint 2015-10-22 17:04:16 +02:00
Jan Steemann 5a190d1110 fixed leaks, index speedup 2015-10-22 17:03:05 +02:00
Michael Hackstein 4fb37846a4 Deactivated nested array index test 2015-10-22 17:00:39 +02:00
Michael Hackstein 7ea4130103 Fixed array indexing if the attribute is not set 2015-10-22 12:13:47 +02:00
Michael Hackstein d6e2e69fb0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-22 11:50:44 +02:00
Michael Hackstein 0a79440634 Fixed sparse array index test. It was requested with null and expected an result... 2015-10-22 11:50:38 +02:00
Jan Steemann caf57a440c added tests 2015-10-22 11:41:36 +02:00
Michael Hackstein 2d02c7a9f8 Fixed sparse array index test. It was requested with null and expected an result... 2015-10-22 09:43:19 +02:00
Michael Hackstein f57e6ede36 Added AQL Array Index Or test 2015-10-21 17:49:52 +02:00
Michael Hackstein f083fc3b66 Added AQL failure tests for EdgeIndex and PrimaryIndex 2015-10-21 16:29:14 +02:00
Michael Hackstein fe455671d4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-21 16:20:44 +02:00
Jan Steemann e187ca26ec Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-21 16:14:27 +02:00
Jan Steemann becac4b4b1 documentation fixes 2015-10-21 16:14:21 +02:00
Alan Plum 4eec43fb28 JSONSchema is so much fun 2015-10-21 16:13:55 +02:00
Michael Hackstein 383912a221 Added failure tests for SimpleAttributeEqualityMatcher 2015-10-21 15:16:55 +02:00
Michael Hackstein e828984837 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-21 15:05:53 +02:00
Michael Hackstein afa7f8a2e3 Added failure tests for HashIndex. Now start with AttributeEqualityMatcher. 2015-10-21 15:00:58 +02:00
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Wilfried Goesgens 7c3de62b08 Add file name here too - since some log messages will not add it and leave the user in the dark. 
Also add the hint that we don't support APP-relative paths anymore.
 2015-10-21 13:58:36 +02:00
Michael Hackstein 9a58955208 Added failure tests for SkiplistIndex 2015-10-21 13:57:00 +02:00
Alan Plum 13a69a4509 Linting 2015-10-21 13:43:24 +02:00
Jan Steemann 74edccbcde Merge branch 'aql-jmmh-conditions' of https://github.com/arangodb/arangodb into devel 2015-10-21 12:56:51 +02:00
Michael Hackstein e13ddcf7b2 Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions 2015-10-21 12:55:16 +02:00
Michael Hackstein 7fb4679fb2 Added some failure tests for the IndexNode, ConditionFinder. Todo Index tests 2015-10-21 12:54:25 +02:00
Jan Steemann 6b67ea7fd9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-10-21 12:53:01 +02:00
Jan Steemann 3396214a63 added db._explain() convenience function 2015-10-21 12:52:40 +02:00
Alan Plum f0e4b027e0 Fix swagger JSON to pass validation 2015-10-21 12:07:33 +02:00
Alan Plum 28edf6cb66 Fix generated service require paths 2015-10-21 12:07:14 +02:00
Jan Steemann 6791dd2936 fixed cluster tests 2015-10-21 10:17:39 +02:00
Michael Hackstein f181f62b9d Fixed usage of IN operator 2015-10-20 15:54:38 +02:00
Michael Hackstein 4018071699 Further tests for aql-queries with array indexes. Right now they fail, array index is used although it cannot actually serve 2015-10-20 15:12:03 +02:00
Michael Hackstein 2ecf67780b Started adding tests for Array Indexes. 2015-10-20 14:33:44 +02:00
Michael Hackstein 17383430d3 Fixed jslint 2015-10-20 09:39:22 +02:00
Michael Hackstein cbd403bade Fixed indexes multi tests 2015-10-20 09:29:48 +02:00
Michael Hackstein ca2c283ab8 Removed debug output in tests 2015-10-20 09:16:34 +02:00
Michael Hackstein 6adfdbe48e Fixed optimizer indexes-in-or test. In the new IndexNode we need to keep the sort node in some queries 2015-10-20 09:15:34 +02:00
Michael Hackstein 8e2d857ba9 Fixed indexes-sort tests 2015-10-19 17:27:53 +02:00
Michael Hackstein e439407dd4 Fixed tests in optimizer-indexes-in-or. We might be able to optimize a bit more here. 2015-10-19 17:13:03 +02:00
Michael Hackstein cc836b554b Fixed optimizer-in-noncluster tests 2015-10-19 16:59:41 +02:00
Michael Hackstein 72283203b8 Further adaption of IdnexNode tests. Added manual sort where Sorting is not guaranteed. 2015-10-19 12:30:15 +02:00
Michael Hackstein 251e365b5b Fixed several sorting tests. The IndexNode does not guarantiee sort order anymore 2015-10-19 11:57:13 +02:00
Michael Hackstein fc0be76a8f The ordering in IndexNode is not guaranteed anymore in IN for now. Remved the check from tests 2015-10-19 11:31:58 +02:00
Jan Steemann e5761736d4 fixed usage of sparse indexes 2015-10-19 10:56:30 +02:00
Michael Hackstein 2137089369 Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions 2015-10-16 10:54:18 +02:00
Max Neunhoeffer 024994e3df Add some interval tests. 2015-10-15 19:04:57 +02:00
Michael Hackstein dd93460318 Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions 2015-10-15 16:20:09 +02:00
Michael Hackstein 06b7d1668a Fixed tests where we can now use indexes other than before 2.7 2015-10-15 16:20:04 +02:00
Max Neunhoeffer 4728dd10d5 Merge branch 'aql-jmmh-conditions' of ssh://github.com/ArangoDB/ArangoDB into aql-jmmh-conditions 2015-10-15 15:37:17 +02:00
Max Neunhoeffer 0087c24db2 Remove some trailing whitespace on some lines. 2015-10-15 15:36:51 +02:00
Max Neunhoeffer fc5e9a5640 Add tests for usage of multiple indexes. 2015-10-15 15:33:26 +02:00
Michael Hackstein 136e375b22 Fixed remove filter covered by index test. And fixed a bug in SkiplistIndexIterator where Nullptr could happen but was not expected 2015-10-15 15:27:35 +02:00
Michael Hackstein 50878b0b41 Fixed the use-index-range test 2015-10-15 14:40:01 +02:00
Michael Hackstein ac351b4141 Another IndexNode test file is executed successfully now 2015-10-15 11:37:38 +02:00
Michael Hackstein f712aee640 Started to remove references to ranges. Still this test throws internal errors 2015-10-14 16:05:00 +02:00
Michael Hackstein ed5c759cd3 Removed debug output in test 2015-10-14 14:10:26 +02:00
Michael Hackstein cc96b6e426 Adaption of Indexes Ranges test 2015-10-14 11:21:08 +02:00
Michael Hackstein 31cf31f7b7 Fixed further AQL optimizer tests. Still some issues in new IndexNode 2015-10-14 11:02:52 +02:00
Michael Hackstein 9d7024b28d Further fixes in AQL optimizer indexes test. It tests now as expected. Some minor issues in IndexNode are still open (Sorting for non-overlapping intervals. Propagation of conditions to earlier EnumerateCollectionNodes 2015-10-14 10:35:28 +02:00
Michael Hackstein e988c0052b Started fixing Optimizer tests, they are supposed to use IndexNode instead of IndexRangeNode now 2015-10-14 09:49:08 +02:00
Michael Hackstein d2e3f7c7c7 Disabled AQL sort rule failure tests 2015-10-13 10:39:43 +02:00
Michael Hackstein 9450e43fda Splitted a large aql-optimizer test file 2015-10-13 10:11:10 +02:00
Michael Hackstein fe5a9ddb93 Replaced IndexRangeNode by IndexNode in tests 2015-10-13 09:56:56 +02:00
Michael Hackstein 356cc4306f Activated use-indexes instead of use-index-range in test 2015-10-13 09:35:18 +02:00
Michael Hackstein c8210551d7 Fixed edges-noncluster test 2015-10-13 09:34:45 +02:00
Michael Hackstein 7821dbcec7 Deactivated use-index-range rule in tests. Activated use-indexes rule instead 2015-10-12 17:47:00 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann fbfc7773ef serialization and deserialization of IndexNodes 2015-10-08 12:02:27 +02:00
Jan Steemann 71a25e798b mchacki: fixed development mode 2015-10-07 17:03:49 +02:00
Jan Steemann d54db0e3ff do not warn verbosely 2015-10-07 10:15:34 +02:00
jsteemann 358befddde added test for issue #1521 2015-10-06 22:36:09 +02:00
Jan Steemann beaf3acbd3 simplifications 2015-10-06 11:58:23 +02:00
Jan Steemann 3f622d71fb fixed some require issues 2015-10-05 10:28:44 +02:00
Wilfried Goesgens 3060e1d63d lintify: break lines. 2015-10-02 15:01:38 +02:00
Wilfried Goesgens 353c01f04f don't output the result json when running from an interactive shell. 2015-10-02 14:47:57 +02:00
Wilfried Goesgens a5d8c12067 unittesting framework 
- don't output xml reports if we run single tests
  - add another token to the 'this is not a testcase name' list
 2015-10-02 13:38:25 +02:00
Wilfried Goesgens 320ac8e1e8 Improve indent readability 2015-10-02 12:31:09 +02:00
CoDEmanX 41d6594246 Documentation formatting 2015-10-02 03:14:55 +02:00
Wilfried Goesgens 1d2cf518dd Add --skipArangoBNonConnKeepAlive to skip this part of the test for os'es that have a problem with to frequent ip connection open/close (windows, macos) 2015-10-01 17:09:43 +02:00
Wilfried Goesgens ab130a025f add prefix to system app contexts - they shouldn't live without namespaces. 2015-09-30 17:55:55 +02:00
Frank Celler 3f8b2a4925 changed to dot notation 2015-09-29 14:14:57 +02:00
Frank Celler f8c79f1ab0 added ARANGODB_DEFAULT_ROOT_PASSWORD 2015-09-29 13:15:25 +02:00
Jan Steemann 2353fc648f fixed documentation errors 2015-09-28 11:56:39 +02:00
Jan Steemann 0e6b1e64da re-added reloadRouting() 2015-09-25 16:38:27 +02:00
Alan Plum 0fcb9ea46e Fixed applicationContext.collectionName 2015-09-25 16:32:17 +02:00
Jan Steemann ace5bd8ec2 some fixes for the web interface 2015-09-25 16:01:13 +02:00
Jan Steemann 9e1d4b0c9d updated CHANGELOG 2015-09-24 16:33:59 +02:00
Alan Plum ef50d88f5e Moved queue creation to queue manager init 2015-09-24 13:46:14 +02:00
Alan Plum 67e2264603 Fixed cyclic import 2015-09-24 13:46:14 +02:00
Alan Plum f8ef55f437 Fixed Foxx preprocessing 2015-09-24 13:46:14 +02:00
Alan Plum 252cba5e9f Implemented FoxxService 2015-09-24 13:46:14 +02:00
Alan Plum 309dcb2c17 Partially implemented FoxxService 
The FoxxService class replaces ArangoApp and should contain the necessary logic to load Foxx services based on their manifests.
 2015-09-24 13:46:14 +02:00
Alan Plum 038267cb06 Re-implemented require/module based on Node 4.1.0 
The require function should now behave as expected and treat ArangoDB's module paths as sources for "external" modules.
The "assert", "buffer" and "path" modules have been moved out of ./js/node into the bootstrap modules.
The module "org/arangodb/foxx/arangoApp" (as well as any modules depending on it) is incompatible with the new module loading behaviour and will be have to be rewritten from scratch.
The "Package" class has been removed entirely and is no longer needed.
Support for the database-stored modules is currently missing and needs to be re-implemented within the module loader.
 2015-09-24 13:46:13 +02:00
Wilfried Goesgens 44c2063662 Add information about the graph the samples are querying so the user has a better overview. 2015-09-23 14:12:18 +02:00
Michael Hackstein a862f0ea30 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-09-22 11:46:32 +02:00
Michael Hackstein aa1242b67c Fixed a bug with AQL EDGES() function. It did not include the correct 
end of the edge when using inbound or outbound in combination with
includeVertices. Reported at
https://groups.google.com/forum/#!topic/arangodb/6yIpzLHprrk
 2015-09-22 11:46:11 +02:00
CoDEmanX 7b95679040 Minor documentation fixes 2015-09-21 19:37:32 +02:00
Michael Hackstein a3e17f8eb6 Added a test for large skip value and skiplist sorting 2015-09-21 13:29:29 +02:00
Michael Hackstein 0d3a095736 Fixed a bug in AQL execution which caused LIMIT <skip> <total> to fail after sorting based on an attribute with skiplist index 2015-09-21 13:15:56 +02:00
Jan Steemann f2d42ec67c removed superfluous print statement 2015-09-18 17:27:25 +02:00
Michael Hackstein 1a7f414c16 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-09-18 12:21:39 +02:00
Frank Celler c4d1fff729 new traversal 2015-09-18 10:40:28 +02:00
Wilfried Goesgens 7f89e6e905 Add hint to the user that starting swagger may take a while. 
A throbber won't do, since swagger is synchroneous and the browser won't animate it.
 2015-09-17 13:29:49 +02:00
Wilfried Goesgens b06d03e84f Cleanup documentation for remaining @-tags 2015-09-17 11:15:33 +02:00
Jan Steemann 74ca6ce9f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-16 16:11:05 +02:00
Jan Steemann 907d98f3dd fixes for sync 2015-09-16 16:10:56 +02:00
Frank Celler 2e2600311a added aliases 2015-09-16 16:05:18 +02:00
Frank Celler c892174c6a added nightly 2015-09-16 15:14:34 +02:00
Jan Steemann c5c51f14da added tests for syncCollection 2015-09-16 11:40:57 +02:00
Jan Steemann a1dc321516 added more compaction tests 2015-09-16 11:39:41 +02:00
Jan Steemann a1a87c0c34 jslint 2015-09-15 14:23:26 +02:00
Jan Steemann dc7ac83354 incremental sync fixes 2015-09-15 14:20:08 +02:00
CoDEmanX f13c2f1fce Alternative DATE_FORMAT() implementation 2015-09-15 11:43:57 +02:00
Jan Steemann d2d3594351 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-14 17:45:09 +02:00
Jan Steemann 75ccd7e2cc fixed incremental sync method 2015-09-14 17:44:12 +02:00
Frank Celler b7bc8526d5 added engine match to available in FoxxManager 2015-09-14 16:52:05 +02:00
Jan Steemann 0c77b4fbe1 fixed tests 2015-09-14 11:55:39 +02:00
CoDEmanX 4158f7d12b Add AQL function DATE_DAYS_IN_MONTH(), extend DATE_FORMAT() 
Conflicts:
	js/server/modules/org/arangodb/aql.js
 2015-09-14 11:35:04 +02:00
CoDEmanX c4c22086e9 Alternative implementation of DATE_FORMAT() 
Conflicts:
	js/server/modules/org/arangodb/aql.js
 2015-09-14 11:31:44 +02:00
Frank Celler d828ae39b4 remove rc and devel for version check 2015-09-14 10:40:37 +02:00
Jan Steemann ea4754546a clear AQL cache objects when starting a query, fixed a few TODOs in AQL date implementation 2015-09-11 21:23:07 +02:00
Jan Steemann 5810095d24 adjusted tests 2015-09-11 12:01:35 +02:00
Jan Steemann 7f3cb7fc2c fixed tests 2015-09-11 10:20:18 +02:00
Jan Steemann b5e76b91cb fixed tests 2015-09-11 10:18:26 +02:00
CoDEmanX 6fba9c5284 Additional AQL date functions: DATE_DAYOFYEAR, DATE_ISOWEEK, DATE_LEAPYEAR, DATE_QUARTER, DATE_ADD, DATE_SUBTRACT, DATE_DIFF, DATE_COMPARE and DATE_FORMAT. 
Unit tests incomplete and untested. Behavior of some functions might need adjustments. ISO duration cache needs to be cleared on every AQL query to avoid a memory leak.

Please rebuild Aardvark and see TODOs in code. Also added Windows shortcuts to ignore list.
 2015-09-11 06:23:36 +02:00
Willi Goesgens a9ade74e87 Upgrade swagger. 2015-09-09 09:29:45 +02:00
Jan Steemann 79a34e94e6 jslint 2015-09-08 17:39:01 +02:00
Jan Steemann a7b51c39da added tests 2015-09-08 17:34:14 +02:00
Michael Hackstein fdde6a69c6 Added failure tests for new implementation of HashIndex. And fixed a memleak there. 2015-09-08 15:35:21 +02:00
Michael Hackstein 9cbbd7dd0f Fixed wrong error reporting in Graph functions 2015-09-08 15:30:32 +02:00
Jan Steemann 560a039f3e added tests 2015-09-08 14:22:23 +02:00
Jan Steemann 3e7f4b61ea added test 2015-09-07 20:54:51 +02:00
Jan Steemann 29d37eb346 added diagnosis functions 2015-09-07 20:48:42 +02:00
Jan Steemann 47360f4511 added tests 2015-09-04 14:21:31 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
Jan Steemann 2e617ac0cc Merge branch 'american-english' of https://github.com/CoDEmanX/ArangoDB into devel 
Conflicts:
	arangod/Wal/Slots.cpp
	lib/Basics/debugging.cpp
	lib/Basics/files.cpp
 2015-09-02 13:14:49 +02:00
Jan Steemann 0e802d6438 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-02 10:20:18 +02:00
Jan Steemann a80d6635ab create fat datafiles 
This prevents SIGBUS when a sparse datafile is accessed and the disk is full. In
this case the mmapped region is not necessarily backed by physical memory, and
accessing the memory may crash the program
 2015-09-02 10:18:24 +02:00
CoDEmanX 956b396e43 Change spelling of 'initialize' to American English (actual code and files) 2015-09-01 17:29:22 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Michael Hackstein 25a52dac53 Disabled test for cluster mode for now 2015-09-01 10:06:26 +02:00
Alan Plum 6b3e08456b Handle ArangoCollection in aqlQuery templates. 2015-08-31 18:16:23 +02:00
Jan Steemann 1867d6c4de added template string generator function `aqlQuery` for generating AQL queries 
This can be used to generate safe AQL queries with JavaScript parameter
variables or expressions easily:

    var name = 'test';
    var attributeName = '_key';
    var query = aqlQuery`FOR u IN users FILTER u.name == ${name} RETURN u.${attributeName}`;
    db._query(query);
 2015-08-30 22:32:26 +02:00
Willi Goesgens 34e8a8fc9f debug printing for misterious ignore of skip 2015-08-26 15:39:02 +02:00
Michael Hackstein 4effa2291e Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-26 10:41:27 +02:00
Willi Goesgens 7b081fb6f3 print usefull error if we fail to start procdump. 2015-08-25 17:14:44 +02:00
Michael Hackstein 40c1361244 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-25 16:40:31 +02:00
Jan Steemann 1af238a6d5 added tests for requireFromIncluded 2015-08-25 12:50:58 +02:00
Jan Steemann 893f9592f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 09:58:04 +02:00
Jan Steemann 387e3e9cd4 make removeByExample, replaceByExample and updateByExample use AQL internally 2015-08-22 23:22:24 +02:00
Jan Steemann b58ecfe206 added firstTick() 2015-08-21 17:11:40 +02:00
Jan Steemann 9e08b1ebc5 add tickRanges() function 2015-08-21 17:00:32 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Michael Hackstein c26be36e61 Added tests for Sparse indexes 2015-08-21 15:04:01 +02:00
Michael Hackstein a2d26056b2 Added a test file for array indexing 2015-08-20 15:48:11 +02:00
Jan Steemann bc7e0f7bbd issue #1445: Object literal simplificatin does not support pseudo-variables NEW and OLD 2015-08-19 09:25:46 +02:00
Willi Goesgens 8992b99ec5 add possibility to skip benchmark tests 2015-08-18 17:02:28 +02:00
Michael Hackstein 527120a3ea Removed outdated documentation, has been replased by a newer version earlier 2015-08-18 16:36:13 +02:00
Michael Hackstein 3f90914397 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-18 16:15:42 +02:00
Michael Hackstein 602c3d0d59 Improved the documentation for Foxx controller 2015-08-18 16:14:39 +02:00
Alan Plum 80b92488f8 Don't warn about Foxx app versions at all. 2015-08-18 13:42:47 +02:00
Michael Hackstein 580066fe8a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-18 13:12:49 +02:00
Michael Hackstein b81ac9be43 Foxx: controller.allRoutes can now use functions defined by extending the controller. 2015-08-18 13:12:40 +02:00
Jan Steemann 76e85ffc1f added test case 2015-08-18 12:09:30 +02:00
Jan Steemann a8e6b1f6a6 added comment 2015-08-16 22:07:16 +02:00
Alan Plum 09723c4757 Foxx non-semver version should merely warn. 2015-08-16 22:05:21 +02:00
Willi Goesgens f36dc42a0e fix docublock syntax 2015-08-14 14:46:28 +02:00
Willi Goesgens 994d850a79 remove toket that is not used anymore. 2015-08-13 18:42:11 +02:00
Willi Goesgens 1dd4d2b326 Disarm deprecated documentation tokens, we won't fix them before deleting them. 2015-08-13 18:40:29 +02:00
Jan Steemann e1bdca6997 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-13 15:48:57 +02:00
Willi Goesgens 662b3e76c7 Unify the usage of docublocks for the foxx-queues 2015-08-13 15:44:38 +02:00
Jan Steemann 9f9a158419 do not execute OOM tests in cluster case, where they cannot fire 2015-08-13 15:38:01 +02:00
Jan Steemann 5b82096145 honor indexBuckets attribute in restore operation of collection 2015-08-13 15:37:32 +02:00
Jan Steemann 6845321737 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	js/server/tests/shell-foxx-manager-spec.js
 2015-08-13 13:21:55 +02:00
Jan Steemann 1aeca516f2 fix jslint 2015-08-13 13:18:02 +02:00
Willi Goesgens b322ede0f7 lintit 2015-08-13 13:11:56 +02:00
Jan Steemann 743d3914d3 enough is enough: disable failing test until properly fixed 2015-08-13 12:41:37 +02:00
Michael Hackstein 90d089f49f Fixed an issue with neighborExamples in GRAPH_EDGES 2015-08-13 11:22:06 +02:00
Jan Steemann 5838e8c8aa fixed wrong usage of errors 2015-08-13 00:17:18 +02:00
Max Neunhoeffer b844ff3468 Finish the role "SECONDARY" in a cluster. Configure replication automatically. 2015-08-12 10:54:30 +02:00
Alan Plum 398a868ea6 Add support for joi options. Fixes #1425. 2015-08-11 16:12:11 +02:00
Jan Steemann 68465ebba5 Merge branch 'collection-not-loaded' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/build/app.js.gz
	js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js
	js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js.gz
	js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part
	js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html
	js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html.gz
	js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html
 2015-08-11 14:16:12 +02:00
Willi Goesgens ad75a69e26 fix syntax in documentation. 2015-08-11 14:09:59 +02:00
Willi Goesgens 40ba3dcffc Improve error message if module doesn't have a callback hook. 2015-08-11 14:08:32 +02:00
Alan Plum 5c6484d3ed Deprecated controller.addInjector. 2015-08-11 13:26:32 +02:00
Alan Plum 5e4630d31d Class-based controllers, models, repos and request contexts. 2015-08-11 13:08:41 +02:00
Alan Plum 1031a3d4e9 Added optional Foxx deps. 2015-08-11 13:08:06 +02:00
Jan Steemann 434d6167db added configuration option `--database.throw-collection-not-loaded-error` 2015-08-11 12:31:42 +02:00
Michael Hackstein 675766490b Fixed a failure test that was not deterministic 2015-08-07 14:56:57 +02:00
Alan Plum fa552c3a52 Removed stray type option from session tests. 2015-08-05 14:07:14 +02:00