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

851 Commits

Author SHA1 Message Date
Max Neunhoeffer 76077f84e7 Report overall test result. 2014-02-21 12:44:31 +01:00
Max Neunhoeffer 3cb1784430 Reorganise unit tests. 
In JS framework we now find the available test files by directory
listing. This means one can simply drop a file in the right
directory to add a test.

We use a naming convention for filenames which is explained
in the README files in the corresponding directories.

Old unit tests do not yet use this but do use the new names and
should still work as usual.
 2014-02-21 11:24:31 +01:00
Max Neunhoeffer 019bb7716f Add authentication tests to js framework. 2014-02-21 10:09:50 +01:00
Jan Steemann 2c1743a732 append port 2014-02-21 10:05:40 +01:00
Frank Celler b248911c79 fixed reget of existing graphs 2014-02-20 23:02:38 +01:00
Max Neunhoeffer 59699a50af Start to add arangob tests to js framework. 2014-02-20 16:20:19 +01:00
Max Neunhoeffer 0bf2dcd17c Add foxx_manager unit test to js framework. 2014-02-20 14:49:48 +01:00
Max Neunhoeffer aeaffb5fad Add upgrade unit test to js framework. 2014-02-20 14:33:50 +01:00
Max Neunhoeffer f0dacea7a3 Please jslint. 2014-02-20 14:13:38 +01:00
Max Neunhoeffer 57813e9e32 Add import unit test to js framework. 2014-02-20 14:10:35 +01:00
Max Neunhoeffer 96c6298a1c Please jslint. 2014-02-20 12:54:03 +01:00
Max Neunhoeffer d2538cefeb Add http_server and ssl_server tests to js framework. 2014-02-20 12:52:03 +01:00
Jan Steemann f8980f94a5 initialise foxx on startup 2014-02-20 09:22:39 +01:00
Jan Steemann 82d84e92dd more sleeping 2014-02-19 18:33:11 +01:00
Jan Steemann d92dd90aac fixed instance race condition 2014-02-19 17:10:11 +01:00
Max Neunhoeffer d0865c309f Fix testing.js. 2014-02-19 15:50:24 +01:00
Jan Steemann dd5b172e2c fixed race conditions 2014-02-19 14:55:21 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
Jan Steemann 9652ee8b14 cluster start 2014-02-19 11:06:12 +01:00
Jan Steemann badf0d26db fixed jslint warning 2014-02-18 16:55:12 +01:00
Jan Steemann 4c29662e90 initialise foxx 2014-02-18 16:47:55 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Max Neunhoeffer 1c05f12c67 Create system collections in kickstarter. 2014-02-18 11:52:09 +01:00
Jan Steemann 5cbfcd6dcc fixed example query 2014-02-18 11:13:20 +01:00
Max Neunhoeffer a0d1888437 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-18 10:15:51 +01:00
Max Neunhoeffer 8b8c8d2fdc Fix jslint. 2014-02-18 10:15:32 +01:00
Jan Steemann 682e00245b fulltext 2014-02-18 10:14:52 +01:00
Jan Steemann 6c3c4b5dce near/within 2014-02-18 09:47:33 +01:00
Jan Steemann 170bb488b9 fixed failing test 2014-02-18 09:04:51 +01:00
Michael Hackstein 49f91512ba Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-18 08:50:32 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Max Neunhoeffer 4d1020321b Start to add command line tools for cluster and creation of system colls. 2014-02-17 23:58:52 +01:00
Max Neunhoeffer b99e14b43b Add single test. 2014-02-17 18:09:14 +01:00
Max Neunhoeffer 8f6ae0c088 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 17:47:40 +01:00
Max Neunhoeffer aa0f4960fd Add boost test to JS test suite. 2014-02-17 17:47:20 +01:00
Jan Steemann 23c303da43 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 17:46:07 +01:00
Jan Steemann 73aa8226e3 geo query 2014-02-17 17:46:02 +01:00
Max Neunhoeffer 8ff2964c63 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/server/modules/org/arangodb/testing.js
 2014-02-17 17:24:33 +01:00
Max Neunhoeffer c567ea90c7 Add unittests_config target to JS testing framework. 2014-02-17 17:07:53 +01:00
Jan Steemann 6491a6797f fixed jslint warnings 2014-02-17 16:44:26 +01:00
Jan Steemann 9f16760359 simple query range 2014-02-17 16:41:10 +01:00
Jan Steemann b8381603d7 fixed invalid assignment 2014-02-17 16:31:22 +01:00
Max Neunhoeffer 510c57aacc Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 14:05:33 +01:00
Max Neunhoeffer 568edcb8fb New test function. 2014-02-17 14:05:17 +01:00
Jan Steemann 25b622aab1 fixed jslint warnings 2014-02-17 11:21:01 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Jan Steemann 3eab509562 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 10:31:07 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Max Neunhoeffer fdd40a5c28 Minor changes in error reporting. 2014-02-14 09:14:33 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Max Neunhoeffer 0d742e4d52 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-13 16:19:44 +01:00
Max Neunhoeffer 339fe1e73d Drive on with testing framework in JavaScript. 2014-02-13 16:19:28 +01:00
Max Neunhoeffer e767ac9e45 Change handling of extraArgs slightly. Export PortFinder. 2014-02-13 16:19:06 +01:00
Jan Steemann bb0f591349 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 15:33:39 +01:00
Jan Steemann 7970881b22 single-threaded plan changes 2014-02-13 15:33:29 +01:00
Max Neunhoeffer 2ce2857c7f Introduce timeout in PortFinder. 2014-02-13 13:50:05 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00
Jan Steemann 70988aa215 removed withStats option 2014-02-13 08:48:22 +01:00
Jan Steemann 4dca29cf4e fixed dropIndex 2014-02-12 18:17:15 +01:00
Jan Steemann deff511fbf removed unused variables 2014-02-12 17:14:27 +01:00
Jan Steemann a8640a5a59 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 17:10:04 +01:00
Jan Steemann c4d52ff133 getIndexes, dropIndex 2014-02-12 17:09:47 +01:00
Max Neunhoeffer f66dc34221 Implement starting and stopping of a cluster. 2014-02-12 16:22:44 +01:00
Max Neunhoeffer a2c954133f Start a new unittest framework running in arangod. 
This should run also on Windows and will allow for cluster tests.
 2014-02-12 16:10:21 +01:00
Jan Steemann 9dc4c9f6c1 getIndexes, coordinator 2014-02-12 14:53:37 +01:00
Jan Steemann db861e59dc simple index creation 2014-02-12 14:16:43 +01:00
Jan Steemann ed93c458df fixed invalid return value 2014-02-12 13:14:14 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
Jan Steemann f11577d952 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 12:47:57 +01:00
Jan Steemann 3dad329979 ensureIndex 2014-02-12 12:47:51 +01:00
Max Neunhoeffer 2f1b0fe061 Use API to shut down servers. 2014-02-12 12:17:52 +01:00
Max Neunhoeffer d92a5d9bea Add authentication between dispatchers. 2014-02-12 09:37:18 +01:00
Jan Steemann 28edb544fd fixed jslint warnings 2014-02-12 09:15:47 +01:00
Frank Celler 5e5ace0ee3 fixed unloadAll for system modules 2014-02-12 08:32:35 +01:00
Frank Celler 289a7dc0e0 fixed unloadAll for system modules 2014-02-11 22:54:02 +01:00
Max Neunhoeffer 01e31ea1ef Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-11 16:22:59 +01:00
Max Neunhoeffer 7ff31c8805 Start documentation for authorization in cluster plan. 2014-02-11 16:22:26 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
 2014-02-11 15:52:49 +01:00
Max Neunhoeffer a78cbf832f Take out a debugging statement and change an error message. 2014-02-11 15:42:01 +01:00
Max Neunhoeffer 97ff9d086d Forward planner and kickstarter to arangosh. 2014-02-11 15:40:33 +01:00
Max Neunhoeffer 09c7bf25c2 Allow forbidding coordinators or DBservers on some dispatchers. 2014-02-11 14:37:45 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Max Neunhoeffer 08077cccb4 Add isHealthy for cluster in kickstarter. 2014-02-11 12:55:25 +01:00
Max Neunhoeffer 9932305c2d Sort out proper logging for kickstarter. 2014-02-11 11:28:36 +01:00
Max Neunhoeffer 95f01d879c Add cleanup functionality for cluster kickstarter. 2014-02-11 11:03:50 +01:00
Max Neunhoeffer d168b0ff7f Finalise Kickstarter. 2014-02-11 09:52:32 +01:00
Jan Steemann d72f9680da Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-10 17:47:00 +01:00
Jan Steemann d52724475f cap constraints 2014-02-10 17:46:54 +01:00
Max Neunhoeffer 1571a7d0fb Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-10 16:08:48 +01:00
Max Neunhoeffer 77df9b6781 Add documentation for kickstarter and planner. 2014-02-10 15:58:38 +01:00
Jan Steemann 0479fd652f geo indexes 2014-02-10 15:53:33 +01:00
Jan Steemann 88bfe8f18c fulltext indexes 2014-02-10 14:55:27 +01:00
Jan Steemann 399ddebbd3 ensureIndex 1st 2014-02-10 14:36:32 +01:00
Jan Steemann 11c470ddd4 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-10 14:15:49 +01:00
Max Neunhoeffer d8d568297c Fix command line args. 2014-02-10 13:30:11 +01:00
Max Neunhoeffer 9113732a53 Add a print for debugging. 2014-02-10 13:27:09 +01:00
Max Neunhoeffer 8fa256b0c5 New option arangodExtraArgs 2014-02-10 13:22:43 +01:00
Max Neunhoeffer 06907b7e9f Cleanup paths in planner and kickstarter. 2014-02-10 11:56:23 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.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/document.json
	js/apps/system/aardvark/api-docs/edge.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/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
 2014-02-09 18:39:11 +01:00
Jan Steemann 154c4c0ec0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-07 16:38:44 +01:00
Jan Steemann 002938aa04 AQL in coordinator 2014-02-07 16:38:35 +01:00
Max Neunhoeffer fe25b3a1d1 Start documentation for sharding. 2014-02-07 16:08:28 +01:00
Jan Steemann 30a5871098 jslint 2014-02-06 15:56:33 +01:00
Max Neunhoeffer 4f2f96b635 Kickstart finally working, seemingly. 2014-02-06 14:32:05 +01:00
Max Neunhoeffer 30f3468a40 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-06 14:10:29 +01:00
Max Neunhoeffer 7bc57b0852 Fix kickstarter bugs with multiple dispatchers. 2014-02-06 14:09:58 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann 96f1bfa70d removed unused variable 2014-02-06 13:12:34 +01:00
Jan Steemann 9a3c5c4277 use limit parameter 2014-02-06 13:10:04 +01:00
Jan Steemann c36b959c69 jslint 2014-02-06 12:21:16 +01:00
Jan Steemann 57365cdcb0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 12:17:51 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Max Neunhoeffer 9295939d98 First working version of planner/kickstarter. 2014-02-06 12:06:23 +01:00
Max Neunhoeffer d6a5825fe4 Change names in files. 2014-02-06 09:14:16 +01:00
Max Neunhoeffer 00b03f8bf1 Rename files. 2014-02-06 09:09:07 +01:00
Jan Steemann 10eb807366 fixed HTTP CRUD operations 2014-02-05 17:19:45 +01:00
Jan Steemann f448a5139a jslint 2014-02-04 17:14:52 +01:00
Jan Steemann 1df92a97b4 fixed JSLint warnings 2014-02-04 17:12:41 +01:00
Jan Steemann ce9136cbfa Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-04 17:10:04 +01:00
Jan Steemann 3a783dca76 added tests 2014-02-04 17:09:58 +01:00
Max Neunhoeffer 56a629b795 Startup agents seems to work. 2014-02-04 14:44:56 +01:00
Jan Steemann 6bb4f0f0ac added SKIPLIST AQL function 
Conflicts:
	CHANGELOG
 2014-02-03 16:54:35 +01:00
Jan Steemann fe9464afec added SKIPLIST AQL function 2014-02-03 16:37:07 +01:00
Max Neunhoeffer 868bf4f0ea Remove a print statement. 2014-02-03 14:00:14 +01:00
Max Neunhoeffer 67ba924aa9 Set up framework for kickstarters/dispatchers. 2014-02-03 13:58:25 +01:00
Max Neunhoeffer a0371ec7d9 Finish planning stage of kickstarter? 2014-02-01 15:07:48 +01:00
Jan Steemann d9bc39c576 don't fail if body response is undefined 2014-02-01 12:08:08 +01:00
Max Neunhoeffer 698e240501 First draft of kickstarter. 2014-02-01 01:51:31 +01:00
Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
 2014-01-31 11:31:09 +01:00
Jan Steemann 8f8c664c5d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-31 11:29:44 +01:00
Jan Steemann 83af3c9617 truncate sharded 2014-01-31 11:29:36 +01:00
Max Neunhoeffer 3966ce0ac7 Rename sharding dir to cluster 2014-01-31 11:24:01 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Jan Steemann ea7772295b issue #755 2014-01-31 02:02:25 +01:00
Jan Steemann b7ad436d19 issue #755: TRAVERSAL does not use strategy, order and itemOrder options 2014-01-31 01:52:07 +01:00
Jan Steemann eb632130b2 fixed documentation 2014-01-30 23:42:48 +01:00
Jan Steemann f4c9b4bc7a documentation updates 2014-01-30 23:31:03 +01:00
Jan Steemann 7bc4f06b6e fixed failing tests 2014-01-30 23:12:40 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Jan Steemann 4f3070715c implemented first() and last() 2014-01-30 19:11:48 +01:00
Jan Steemann 6b00e2ccc2 updateByExample sharded 2014-01-30 17:54:25 +01:00
Jan Steemann 8d1ac573a6 removeByExample sharded 2014-01-30 17:40:19 +01:00
Jan Steemann 51a58b7844 collection.any() sharded 2014-01-30 17:30:39 +01:00
Jan Steemann 7a8f2257cc batchSize 2014-01-30 16:09:25 +01:00
Jan Steemann ae05c0c5d3 byExample() sharded 2014-01-29 17:55:33 +01:00
Jan Steemann 57aa26bf4a all() with skip/limit 2014-01-29 14:57:28 +01:00
Jan Steemann 5f8a59d696 all() sharded 2014-01-29 13:51:12 +01:00
Jan Steemann 0a2d61a42a added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc. 2014-01-28 01:51:27 +01:00
Jan Steemann e90ee8c572 shut up jslint 2014-01-27 17:30:44 +01:00
Michael Hackstein 2b327912d5 Foxx Controller will now react to int and integer. Furthermore it throws an error if an illegal attribute is defined 2014-01-27 16:20:32 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
 2014-01-24 14:50:09 +01:00
Frank Celler 6679995e76 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	Documentation/man/man1/arangob.1
	Documentation/man/man1/arangodump.1
	Documentation/man/man1/arangoimp.1
	Documentation/man/man1/arangorestore.1
	Documentation/man/man1/arangosh.1
	Documentation/man/man8/arango-dfdb.8
	Documentation/man/man8/arangod.8
	Documentation/man/man8/foxx-manager.8
	Documentation/man/man8/rcarangod.8
	Makefile.in
	VERSION
	aclocal.m4
	build.h
	config/config.guess
	config/config.sub
	config/missing
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.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/server/bootstrap/module-internal.js
	js/server/modules/org/arangodb/actions.js
	js/server/modules/org/arangodb/foxx/authentication.js
	js/server/modules/org/arangodb/foxx/manager.js
	lib/ApplicationServer/ApplicationServer.cpp
 2014-01-23 22:24:20 +01:00
Jan Steemann 6ec73a5589 fixed reference to unused variable 2014-01-23 16:48:24 +01:00
Michael Hackstein 25dee09874 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-23 16:31:41 +01:00
dajester2013 bc09265335 Update ahuacatl.js 
vertexFilterType -> vertexFilterMethod
 2014-01-23 06:02:30 -06:00
dajester2013 f99df3b6b0 Update ahuacatl.js 
followVertices changed to filterVertices
 2014-01-23 05:48:23 -06:00
dajester2013 1cad676170 Update ahuacatl.js 
fix indentation
 2014-01-23 05:46:34 -06:00
dajester2013 27806d90a8 traversal(_tree) vertex filtering 
added params "filterVertices" and "vertexFilterType" to traversal(_tree).  "filterVertices" accepts an array of examples similar to "followEdges", while "vertexFilterType" defines how to filter out vertices that do not match the examples. "vertexFilterType" can be set to "prune", "exclude", or (default) ["prune","exclude"].
 2014-01-23 05:45:28 -06:00
Jan Steemann 5f442ef742 bugfixes 2014-01-23 11:47:49 +01:00
Michael Hackstein 6a0d219bd5 Fixed bug in agency communication. Discrepancy with Agency content 2014-01-23 10:12:48 +01:00
Jan Steemann 39fd7611ed load/unload of collections 2014-01-22 17:20:06 +01:00
Jan Steemann 8a74c2864e cleanup of current/collections 2014-01-22 11:41:32 +01:00
Jan Steemann 7e732174ce Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 15:14:13 +01:00
Jan Steemann ddfa36274d preparation 2014-01-21 15:14:07 +01:00
Michael Hackstein 23e0122f0f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 14:42:22 +01:00
Max Neunhoeffer a1a99170e1 Add information about Current collections to ClusterInfo. 2014-01-21 14:28:30 +01:00
Michael Hackstein 7cd01e816c Fixed new discrepancies between the etcd agency and the high level javascript communication, based on Shards in Collections in the Current state 2014-01-21 14:16:24 +01:00
Jan Steemann 74c76ce41e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 11:10:52 +01:00
Jan Steemann 2ddacc65e8 clean up Current/Databases for ourselves 2014-01-21 11:10:25 +01:00
Max Neunhoeffer 06953daf80 Fix reporting of dropped shard in Current. 2014-01-21 10:44:02 +01:00
Max Neunhoeffer eec3c08f87 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-21 09:57:26 +01:00
Max Neunhoeffer 18436b6b27 Fix reporting of new collection in Current (shardID instead of DBserverID) 2014-01-21 09:56:54 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-01-21 09:29:45 +01:00
Michael Hackstein c7f86b3def Updated high-level js communication library for newest version of agency comm 2014-01-20 16:37:56 +01:00
Jan Steemann 583878176b issue #736: AQL function to parse collection and key from document handle 
Conflicts:

	CHANGELOG
 2014-01-17 23:13:06 +01:00
Jan Steemann 9f69aae986 issue #736: AQL function to parse collection and key from document handle 2014-01-17 22:39:04 +01:00
Jan Steemann 435b56bea2 fixed dropping of collections 2014-01-17 18:27:55 +01:00
Jan Steemann 7751576907 report errors back to the server 2014-01-17 14:19:52 +01:00
Jan Steemann 0bbbd53d4d added fm.rescan() method 
Conflicts:
	CHANGELOG
 2014-01-17 14:06:27 +01:00
Jan Steemann c7380398d9 added fm.rescan() method 2014-01-17 14:04:10 +01:00
Max Neunhoeffer e5f8331093 Report collection better in Current. 2014-01-17 14:03:16 +01:00
Jan Steemann 07c0ed3bab creation/removal of local shards 2014-01-17 12:43:34 +01:00
Jan Steemann 8010963a94 handle plan change for create/drop database 2014-01-16 17:03:10 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Jan Steemann 334cd51e6f include console 2014-01-16 15:01:07 +01:00
Jan Steemann a987647bd2 handle state changes 2014-01-16 14:52:40 +01:00
Frank Celler d0c05f6628 fixed issue #734: foxx cookie and route problem 2014-01-16 14:16:47 +01:00
Frank Celler 87009c7e6e added missing db prefix 2014-01-16 14:08:45 +01:00
Jan Steemann 657406bb70 fixed jslint warnings 2014-01-15 18:15:38 +01:00
Jan Steemann 72902b2e62 fixed jslint warnings 2014-01-15 18:06:17 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Frank Celler 30252c1877 Merge pull request #731 from pluma/error-response-error-names 
Added support for error names instead of error types
 2014-01-14 00:27:39 -08:00
Jan Steemann f8c50ade6e force reloading of user functions 2014-01-13 17:50:36 +01:00
Jan Steemann 8ea145cd8f force reloading of user functions 2014-01-13 17:49:44 +01:00
Alan Plum d055c778d4 Added support for error names instead of error types. 2014-01-11 21:37:59 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Jan Steemann 269e50eb8f defer evaluation of logical operators 2014-01-10 16:45:07 +01:00