1
0
Fork 0
Commit Graph

2612 Commits

Author SHA1 Message Date
Jan Steemann 19fb30db14 Revert "free barriers properly"
This reverts commit 35a74cf20ce1fa7f801b375fe7a6a51da9536ee5.

Conflicts:
	arangod/V8Server/v8-query.cpp
2014-03-13 23:28:11 +01:00
Jan Steemann 9b0bb25cc5 don't requeue identical global context methods 2014-03-13 21:48:27 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
Jan Steemann 4cd329090b free barriers properly 2014-03-13 20:09:53 +01:00
Jan Steemann 40445d973e negate condition for iterate markers 2014-03-13 18:11:26 +01:00
Jan Steemann 6f3b4725f6 removed hash array statistics 2014-03-12 19:56:23 +01:00
Jan Steemann ff2198151b fixed vector insert at end 2014-03-12 14:27:51 +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
Jan Steemann 9da8d0ddfe allow startup options `temp-path` and `default-language` to be specified from the command-line and not only from config files 2014-03-12 12:12:58 +01:00
Max Neunhoeffer 7b9e40ade6 Fix the initialiser order to please the compiler. 2014-03-11 19:49:11 +01:00
Max Neunhoeffer 7014f0bcb0 Circumvent a Visual Studio Express 2013 compiler bug. 2014-03-11 16:13:03 +01:00
Frank Celler 6ea76eeb9c new bison 3 2014-03-10 19:24:28 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Jan Steemann 3c88e45802 fixed too eager compaction
Conflicts:
	CHANGELOG
	arangod/VocBase/compactor.c
2014-03-10 16:55:15 +01:00
Max Neunhoeffer cd0a33de9f Seemingly fix behaviour on Windows.
Note: WSACleanup complains and we do not know a fix.
2014-03-07 16:48:21 +01:00
Jan Steemann ec9e3f2402 debug information 2014-03-07 12:17:38 +01:00
Max Neunhoeffer 9d43383f1d Fix automatic reload of user config on coordinators. 2014-03-07 11:37:16 +01:00
Max Neunhoeffer ed46d0d3a8 Increase TTL value for heartbeat status in agency to 8. 2014-03-06 17:54:34 +01:00
Jan Steemann b3b22a1f1c changed authentication procedure 2014-03-06 16:37:00 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Esteban Lombeyda e38906dd21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp
2014-03-05 09:12:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Jan Steemann 415055705f adjusted documentation 2014-03-04 18:45:56 +01:00
Jan Steemann 5ebdc7d307 fixed "cannot convert value to JSON" error 2014-03-04 16:21:40 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Jan Steemann c092158891 disable forwarding of expect header 2014-03-03 19:24:26 +01:00
Jan Steemann a4451d3459 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:03:51 +01:00
Jan Steemann f5234b0ed6 always return ignoreNull 2014-03-03 12:03:14 +01:00
Frank Celler 79a98c5095 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 11:12:14 +01:00
Frank Celler 2e80955b5f removed debug message 2014-03-03 11:12:08 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 8041752f4f documentation 2014-03-03 10:33:29 +01:00
Jan Steemann 1481ceba42 documentation 2014-03-03 10:28:38 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann be8abb0cc1 allow syncing with 2.0 2014-02-28 22:19:21 +01:00
Jan Steemann 978e784462 disable replication handlers for coordinators 2014-02-28 21:51:02 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	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/cursor.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/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
Jan Steemann 0b1dcc0deb include collection in inventory if id is equal to current server tick 2014-02-28 20:00:04 +01:00
Max Neunhoeffer 944f29deb0 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:51:24 +01:00
Max Neunhoeffer cb8f0257a7 Give the server state in the agency a time to live. 2014-02-28 18:47:46 +01:00
Jan Steemann 3ca2001c99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:43:36 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +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