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

1074 Commits

Author SHA1 Message Date
Jan Steemann 34389a10d3 added AQL TRANSLATE function 2014-06-13 19:53:58 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Lucas Dohmen 80ab3968bd Foxx: Adjust structure & content of documentation and code of Repository 2014-06-13 15:47:52 +02:00
Jan Steemann d592591a06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 11:31:59 +02:00
Lucas Dohmen 120ecaa000 JSLint 2014-06-13 11:00:57 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
Lucas Dohmen 87987b7a14 Merge pull request #897 from pluma/foxx-context-collection-method 
Added `collection` method to Foxx applicationContext
 2014-06-12 16:41:50 +02:00
Lucas Dohmen 4dbaa665ac Merge pull request #895 from pluma/sugary-foxx-exports 
More sugary Foxx exports
 2014-06-12 16:39:57 +02:00
Alan Plum 477cec53aa Cleaned up stray whitespace. 2014-06-12 15:57:39 +02:00
Alan Plum c935ea6d20 Fixed reference to context. 2014-06-12 15:54:01 +02:00
Lucas Dohmen d12e993289 Merge pull request #896 from pluma/foxx-no-required-controllers 
Allow controller-free Foxx apps
 2014-06-12 15:38:20 +02:00
Alan Plum 251f237184 Renamed Foxx.app -> Foxx.requireApp. 2014-06-12 15:14:09 +02:00
Alan Plum fdea995b6e Deprecated Foxx.Controller#collection. 2014-06-12 15:12:05 +02:00
Alan Plum 41a82d9726 Added friendlier wrapper for manager.mountedApp. 2014-06-12 15:09:02 +02:00
Alan Plum 9857fa571e Allow controller-free apps. 2014-06-12 15:08:46 +02:00
Alan Plum e7f6aecaf5 Added collection method to Foxx applicationContext. 2014-06-12 15:07:18 +02:00
Lucas Dohmen 38bf144496 Foxx: Documentation for extended bodyParam functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen b5529ac37e Introduce optional root element for body params 2014-06-12 15:02:46 +02:00
Lucas Dohmen e24d344016 Add option for the rootElement and make it available via appContext 2014-06-12 15:02:46 +02:00
Lucas Dohmen d4a6250fc2 Foxx: Body Params can optionally take more than one object 2014-06-12 15:02:46 +02:00
Frank Celler 1aa671ed8c fixed string constraints 2014-06-12 13:42:46 +02:00
scottashton e6d68e6070 finished documenation for aql graph 2014-06-12 10:43:20 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2014-06-11 17:40:15 +02:00
scottashton f4b67ed01d jslinted 2014-06-11 16:04:15 +02:00
scottashton 5bb6a22e82 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:45:46 +02:00
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +02:00
Jan Steemann 49cc332361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/bootstrap/errors.js
 2014-06-11 14:23:47 +02:00
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +02:00
Heiko Kernbach eb08541171 foxx apps install now via github 2014-06-10 15:21:27 +02:00
Jan Steemann 191b46c063 fixed undefined variable access 2014-06-10 09:43:15 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +02:00
Michael Hackstein fdb79e26d1 The foxx manager now throws a more useful error if the fetched file is already on the server 2014-06-06 15:40:19 +02:00
Michael Hackstein 920cf4b7c3 Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark 2014-06-06 15:00:26 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Frank Celler 8dc8600eb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/model.js
 2014-06-03 17:20:18 +02:00
Frank Celler 44aefb2344 added mountedApp 2014-06-03 17:19:03 +02:00
scottashton 5ef0371ad6 make jslint stop nagging 2014-06-03 16:31:44 +02:00
scottashton af4d4e6d25 make jslint stop nagging 2014-06-03 16:30:23 +02:00
gschwab 859f104c5d jslint 2014-06-03 16:29:46 +02:00
scottashton 8f347f2b54 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:25:26 +02:00
scottashton 006eb3b61b calculation of measurements for graphs added and changed calculation of shortst paths to Floyd–Warshall algorithm 2014-06-03 16:25:13 +02:00
Frank Celler 2b29c627cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-03 15:56:58 +02:00
Frank Celler 2dfe5ceb76 only use next action if not restarting 2014-06-03 15:52:41 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Alan Plum d9fa68a493 Whitelist metadata attributes in forDB. Fixes #877. 2014-06-02 13:08:16 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann f5eb65c96c javascript cleanup 2014-05-31 01:53:30 +02:00
Michael Hackstein 867ace8ece Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-28 21:48:27 +02:00
Michael Hackstein 5228984679 Fixed graph tests 2014-05-28 21:48:22 +02:00
Jan Steemann d8c2288341 simplified sort function 2014-05-28 21:11:37 +02:00
Jan Steemann 7caee50818 less function calls 2014-05-28 18:34:23 +02:00
Max Neunhoeffer 9c4188e42b Document cluster upgrade procedure. 2014-05-28 15:17:29 +02:00
Max Neunhoeffer c53f17f66a Implement cluster upgrade in Kickstarter. 2014-05-28 15:17:19 +02:00
Esteban Lombeyda 84b31d49da functions byExample was documented 2014-05-28 11:12:32 +02:00
scottashton 7119cfd5fb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 09:59:15 +02:00
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +02:00
gschwab a0f8e9d166 check, if edge is already used in a definition 2014-05-28 09:40:48 +02:00
gschwab dc0c91c038 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 09:25:29 +02:00
gschwab e955d27f7b arango-blueprints updated to use new graph sturcture 2014-05-28 09:22:35 +02:00
Esteban Lombeyda d278fdc28e Bug fix: in updateByExample 2014-05-27 16:27:03 +02:00
Esteban Lombeyda 785f374a5e Big fix: wrong use of undefined 2014-05-27 14:36:14 +02:00
Jan Steemann b876bfd34f fixed typos 2014-05-27 11:04:10 +02:00
Esteban Lombeyda 8353af15eb renaming test method and cleaning 2014-05-26 16:07:47 +02:00
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00
Esteban Lombeyda a803c16016 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 10:56:17 +02:00
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +02:00
Michael Hackstein 03c91573c1 Merged my offline state for general graphs and included all the tests, everything is green. Fluent interface is on a good way 2014-05-23 15:54:39 +02:00
scottashton f7a78f354d added tests for GRAPH_VERTICES 2014-05-23 15:08:35 +02:00
scottashton 51cc041052 added GRAPH_VERTICES 2014-05-23 14:29:53 +02:00
scottashton 3bec9b4c93 refactored aql 2014-05-22 17:49:20 +02:00
scottashton 247fea8cef neighbors 2014-05-22 09:17:43 +02:00
Jan Steemann ecf08da0cf cleanup 2014-05-20 17:44:52 +02:00
scottashton a8cacef57d added GRAPH_NEIGHBORS 2014-05-20 16:45:22 +02:00
scottashton c99ce5167d traversal aql 2014-05-20 15:55:07 +02:00
scottashton 009f83026a finished GRAPH_PATHS in aql 2014-05-20 13:50:34 +02:00
Jan Steemann b06e89da54 simplified 2014-05-19 17:44:56 +02:00
scottashton 0f68fa982d fixed bug in edges 2014-05-19 16:42:30 +02:00
scottashton 256868bdc2 aql function edges 2014-05-19 15:28:05 +02:00
Jan Steemann 295870565b issue #864: Inconsistent behavior of AQL REVERSE(list) function 2014-05-19 09:31:39 +02:00
Jan Steemann bed37d7d11 slightly less comparisons 2014-05-17 12:04:54 +02:00
Jan Steemann e532223fcd small optimizations 2014-05-17 01:38:39 +02:00
Jan Steemann 63b287157f jshund 2014-05-17 00:55:37 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 9984b341ac fixed comment 2014-05-14 21:12:58 +02:00
Frank Celler db566d53d9 added rewriteRequest 2014-05-14 20:15:12 +02:00
Jan Steemann ee8fe74a8a removed tabs 2014-05-14 17:41:00 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
Jan Steemann d23fe23254 added tasks manual entry 2014-05-10 02:25:59 +02:00
Frank Celler 65ad94d9cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:15:11 +02:00
Frank Celler c2d57c7909 added applicationContext and foxxFilename 2014-05-09 17:12:55 +02:00
Jan Steemann 91327e1497 fixed jslint warning 2014-05-09 13:31:52 +02:00
Max Neunhoeffer 21b0264e01 Sort out SSL in PortFinder. 2014-05-09 11:48:06 +02:00
Jan Steemann 78185a60d7 fixed return code for async job cancellation 2014-05-08 18:27:46 +02:00
Jan Steemann 21cfd10453 added AQL FLATTEN function 2014-05-07 19:50:58 +02:00
Jan Steemann 7f9446f6bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 18:48:44 +02:00
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
scottashton 169ca7589e fixed healthcheck 2014-05-07 11:12:37 +02:00
Max Neunhoeffer ad5db2a380 Use cluster auth for shutdown. 2014-05-06 13:02:38 +02:00
Max Neunhoeffer 7b44869eb3 Fix kickstarter process startup and shutdown. 2014-05-06 11:44:25 +02:00
Jan Steemann 8f821d62fe prevent AQL query from failing 2014-05-05 21:50:15 +02:00
Jan Steemann b978a271ea added AQL function `CURRENT_DATABASE()` 2014-05-02 22:06:47 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
Jan Steemann 0cb2217518 no need to run the GC after each and every request during testing 
this change will hopefully make tests run a bit faster
 2014-04-23 23:22:49 +02:00
Jan Steemann a4ee394d4b fixed AQL return codes in the face of cancellation 2014-04-23 19:07:34 +02:00
Jan Steemann 3744e8dde9 issue #796: Searching with newline chars broken? 2014-04-22 13:38:06 +02:00
Jan Steemann 4075f08aef silence foxx manager 2014-04-22 12:13:53 +02:00
gschwab ca984e1212 added 'passwordToken' to create user, fixed small bug with changePassword attribute 2014-04-17 13:27:02 +02:00
Frank Celler 39fd596abc changed return of users.remove 
Conflicts:
	js/actions/api-user.js
 2014-04-16 19:56:04 +02:00
Frank Celler 22ad916024 added configuration module, documentation is not there yet 2014-04-13 14:20:09 +02:00
Frank Celler e30414b839 fixed path 2014-04-10 17:32:08 +02:00
gschwab 68be5db03b added foxx app to change initial password 2014-04-10 17:31:44 +02:00
Frank Celler 99bc134bcf added password token functions 2014-04-10 17:31:33 +02:00
Jan Steemann 88c3089b36 don't report bogus error messages 2014-04-02 17:51:25 +02:00
Jan Steemann 7eeba86254 update routing cache all or nothing 2014-04-02 16:29:42 +02:00
Michael Hackstein 7549c13bc5 Created a simple change password implementation for foxx. Added Documentation 2014-04-01 17:23:09 +02:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Frank Celler 11fb42e722 removed SYS_TEST_PORT from global namespace 2014-03-20 23:05:17 +01:00
Jan Steemann 0ac6928e0f prevent `body length: -9223372036854775808` being printed 2014-03-20 20:45:06 +01:00
Frank Celler e3df90d2c3 coffee script fix 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-03-20 19:36:42 +01:00
Michael Hackstein f7a85aa079 Fixed Cluster Agency Communication Tests 2014-03-14 10:54:26 +01:00
Max Neunhoeffer 2a0e487520 Improve error reporting. 2014-03-14 10:33:22 +01:00
Jan Steemann ec75cbe11a transactionally query installed apps so prevent race conditions in case of parallel de-installation of apps 2014-03-13 21:50:19 +01:00
Jan Steemann 9b0bb25cc5 don't requeue identical global context methods 2014-03-13 21:48:27 +01:00
Max Neunhoeffer 51ab7bbb9b Skip dump and import tests on the cluster because they cannot work. 2014-03-13 13:38:19 +01:00
Max Neunhoeffer d84fd0a37f Really deactivate a test that cannot work on the cluster. 2014-03-13 13:35:43 +01:00
Max Neunhoeffer 0d3b1eccb4 Do not remove logs directory after ruby tests. 2014-03-13 09:51:46 +01:00
Jan Steemann 0dfac28f71 jslint 2014-03-12 17:54:28 +01:00
Max Neunhoeffer 9e42ec4409 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-12 16:21:38 +01:00
Max Neunhoeffer 77296e3a84 Enable SSL on cluster. 2014-03-12 16:21:19 +01:00
Jan Steemann babaf2738b adjusted tests 2014-03-12 14:19:13 +01:00
Jan Steemann 35cf13a38c more tests for shapes 2014-03-12 13:26:09 +01:00
Max Neunhoeffer a70c082a0d Quote a string correctly for Windows. 2014-03-11 09:32:57 +01:00
Max Neunhoeffer 6206f91d56 Yet another fix for process shutdown on Unix. 2014-03-07 16:20:12 +01:00
Max Neunhoeffer 101486c6af Improve error handling in process startup in js testing framework. 2014-03-07 15:01:50 +01:00
Max Neunhoeffer 79ac8949dd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-03-07 11:37:31 +01:00
Max Neunhoeffer 9d43383f1d Fix automatic reload of user config on coordinators. 2014-03-07 11:37:16 +01:00
Jan Steemann ae202acb5c assign an id to the system database, too 2014-03-07 10:23:17 +01:00
Frank Celler baa68e0958 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-06 17:38:23 +01:00
Frank Celler 15e1fbbb0d replaced meier by arango 2014-03-06 17:38:18 +01:00
Max Neunhoeffer 3c198365fc Do not run version-check.js at relaunch. 
Rationale: We cannot possibly know the right authentication
because the owner of the cluster might have changed the password.
Also, it is not necessary to run the script.
 2014-03-06 16:39:30 +01:00
Jan Steemann e1a190a51d fixed segfault during test on Windows 2014-03-04 16:58:22 +01:00
Max Neunhoeffer ef474bde11 Quote string in server tests for Windows backslashes. 2014-03-04 16:21:30 +01:00
scottashton 44ab5d1398 new method admin/history to fetch the statistics history for single arango, coordinator and dbserv 2014-03-04 12:05:00 +01:00
Michael Hackstein 799f443b2f Heartbeats are now interpreted the new way 2014-03-01 14:07:58 +01:00
Michael Hackstein af9541edbc Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 23:20:08 +01:00
Michael Hackstein 017c15638e Fixed all routes for the geraffelige dashboard reload in cluster 2014-02-28 23:19:57 +01:00
Max Neunhoeffer a264b55f32 Fight zombies. 2014-02-28 20:24:42 +01:00
Max Neunhoeffer b156e93293 Take out 2 tests involving transactions of cluster tests. 2014-02-28 18:01:04 +01:00
Max Neunhoeffer 7544adcc8d Fix JS testing framework with new path setup. 2014-02-28 15:38:25 +01:00
Max Neunhoeffer f3095dbaf7 Servers in cluster are not themselves dispatchers. 2014-02-28 15:10:42 +01:00
Max Neunhoeffer 9939b46a16 Disable dispatcher on servers in cluster. 2014-02-28 14:56:28 +01:00
Max Neunhoeffer c358c677b0 Fix typo. 2014-02-28 14:43:35 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Max Neunhoeffer 0dec16279c Fix missing require for base64Encode. 2014-02-28 13:17:32 +01:00
Max Neunhoeffer c342713481 Create logPath directory in kickstarter if not already there. 2014-02-28 12:28:05 +01:00
Max Neunhoeffer eb62ca7f54 Fix name. 2014-02-28 12:19:19 +01:00
Max Neunhoeffer d201cdbd03 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:16:13 +01:00
Max Neunhoeffer 454f86ef01 New setup of paths on cluster kickstarter. 2014-02-28 12:15:31 +01:00
Michael Hackstein 543a65a5e0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:09:20 +01:00
Michael Hackstein 352ccf903f Fixed js error in kickstarter 2014-02-28 12:09:08 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Max Neunhoeffer 0ede95adb8 Hand on authorization information to other dispatchers. 2014-02-28 11:49:43 +01:00
Max Neunhoeffer 05055f3d5d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 11:41:01 +01:00
Jan Steemann c4cfe7a2ea fixed AQL geo queries 2014-02-28 10:26:31 +01:00
Max Neunhoeffer 10aec4ec4d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 10:00:14 +01:00
Jan Steemann e505a99a4e fixed fulltext query 2014-02-28 09:56:44 +01:00
Max Neunhoeffer b61dfa3c12 Cleanup results of launch and friends in kickstarter. 
Add allowAgents option for dispatchers.
 2014-02-28 09:31:16 +01:00
Jan Steemann e9c6f17594 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 17:45:31 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Max Neunhoeffer 2ca78ea168 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:21:28 +01:00
Max Neunhoeffer a0e187cc29 Finish sharding chapter in user documentation. 2014-02-27 16:20:53 +01:00
Jan Steemann ed43b0cce9 jslint 2014-02-27 14:58:53 +01:00
Jan Steemann 4bab2cbf35 fixed queries 2014-02-27 14:20:57 +01:00
Max Neunhoeffer 8659f0569e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 13:55:02 +01:00
Max Neunhoeffer 4c495ae297 Only use one agent ==> incredible speedup. 2014-02-27 13:54:41 +01:00
Frank Celler ce3f8ba45b added dispatcherDisabled check 2014-02-27 13:32:06 +01:00
Max Neunhoeffer 37908e7c00 Please jshund. 2014-02-27 11:59:40 +01:00
Max Neunhoeffer 74eb4ed39c Fix isHealthy check. 2014-02-27 11:49:45 +01:00
Max Neunhoeffer a1614f759c Take out etcd steroids. 2014-02-27 11:41:33 +01:00
Max Neunhoeffer 0009020e5d Rename etcd executable to etcd-arango 2014-02-27 11:40:37 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
 2014-02-27 09:13:03 +01:00
Frank Celler bc56d26ea3 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 08:52:27 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangosh/V8Client/arangosh.cpp
 2014-02-26 21:34:34 +01:00
Jan Steemann f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann 8e44bc80a5 return error if etcd binary is not present 2014-02-26 20:24:20 +01:00
Frank Celler 4a4fcfd72f Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-26 16:38:47 +01:00
Frank Celler e58c0d00d6 be tolerant 2014-02-26 16:38:39 +01:00
Max Neunhoeffer 89761d5c7e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:39:20 +01:00
Jan Steemann 2db3d4b42d fixed tests 2014-02-26 14:35:14 +01:00
Max Neunhoeffer d09da8789e Slightly change naming convention for tests. 2014-02-26 14:28:16 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00