1
0
Fork 0
Commit Graph

650 Commits

Author SHA1 Message Date
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
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 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