1
0
Fork 0
Commit Graph

17601 Commits

Author SHA1 Message Date
Max Neunhoeffer ddf85982f0 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-31 11:50:54 +01:00
Max Neunhoeffer 8f854ec3b2 Fix a leak in cluster instanciation of queries. 2014-10-31 11:50:34 +01:00
Willi Goesgens 10bf137692 Move free logic into its own function, so we can call in in both places. 2014-10-31 11:28:27 +01:00
Jan Steemann a89d74b402 added 2.3 branch 2014-10-31 10:39:41 +01:00
Jan Steemann 694d225c9d silence 2014-10-31 10:38:10 +01:00
Jan Steemann ed880f0c22 gdb 2014-10-30 23:50:40 +01:00
Jan Steemann d954d2db98 fixed warnings 2014-10-30 19:23:11 +01:00
Jan Steemann 89c20d436c jslint 2014-10-30 19:18:47 +01:00
Jan Steemann d4d3e37a0d added internal.parseFile 2014-10-30 19:18:05 +01:00
Jan Steemann c19060da27 changed www.arangodb.org to www.arangodb.org 2014-10-30 19:17:25 +01:00
Jan Steemann f6146eb71e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-30 17:37:21 +01:00
Heiko Kernbach 170cedf26e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-30 17:37:09 +01:00
Heiko Kernbach faced9a8d8 merge error 2014-10-30 17:37:01 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Willi Goesgens d216b90371 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-30 16:08:44 +01:00
Willi Goesgens 6b2f4d4067 Split shell-statement into statement / explain-cluster / explain-noncluster 2014-10-30 16:08:10 +01:00
Heiko Kernbach 157f254420 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-30 15:55:02 +01:00
Heiko Kernbach e79fd49817 merge 2014-10-30 15:54:55 +01:00
Max Neunhoeffer d4986a6711 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-30 14:59:18 +01:00
Max Neunhoeffer c07bfb894d Fix a memleak in cluster. 2014-10-30 14:58:59 +01:00
Max Neunhoeffer e74e3ac8db Fix a use after free in RestAqlHandler. 2014-10-30 14:58:34 +01:00
Max Neunhoeffer 4503d7a982 Fix a memleak in instanciation. 2014-10-30 14:58:12 +01:00
Heiko Kernbach 1ae7c494a6 karma test 2014-10-30 14:55:37 +01:00
Willi Goesgens 501c721e72 Add jmeter JTL output format to perftests 2014-10-30 14:16:08 +01:00
Thomas Schmidts dcfe5bb700 Fixed #1046. Substring is now mentioned correctly 2014-10-30 13:59:52 +01:00
Willi Goesgens e355f890d0 Follow file renaming 2014-10-30 12:50:51 +01:00
Willi Goesgens 0279cc1bd6 Output which ip/port we fail to bind. 2014-10-30 11:12:54 +01:00
Max Neunhoeffer 609adf0d37 Fix tests on cluster. 2014-10-30 10:57:31 +01:00
Max Neunhoeffer 383c222109 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-30 10:47:31 +01:00
Max Neunhoeffer e5249582ed Fix tests in cluster. 2014-10-30 10:47:09 +01:00
Willi Goesgens 97459a1aa6 Reset test stati when results are fetched. 2014-10-30 10:23:21 +01:00
Max Neunhoeffer 9a67b9a2cb Fix tests for cluster. 2014-10-30 10:17:52 +01:00
Max Neunhoeffer de29d95bfd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-30 09:53:49 +01:00
Jan Steemann 29c226eb65 removed dependency 2014-10-30 09:51:49 +01:00
Max Neunhoeffer 3960ff5667 Fix TRI_FreeBarrier by giving two variants. 2014-10-30 09:51:13 +01:00
Max Neunhoeffer 1d867643d5 Protect some flags in a barrier by the barrier lock. 2014-10-30 09:36:38 +01:00
Jan Steemann 4418e58315 removed old-style Doxygen sections 2014-10-30 01:16:07 +01:00
Jan Steemann e376391bfa added scripts to automatic testing 2014-10-30 00:46:58 +01:00
Jan Steemann 31d875921f removed TODOs 2014-10-30 00:45:55 +01:00
Jan Steemann b65eccfe6f removed unused file 2014-10-30 00:45:32 +01:00
Jan Steemann 480ffbe313 removed some obsolete entries 2014-10-30 00:20:55 +01:00
Jan Steemann cf6fcb2fc1 linted python files, regenerated derived files 2014-10-29 23:56:20 +01:00
Jan Steemann 09e0a4e3c4 nullptr 2014-10-29 23:17:56 +01:00
Jan Steemann b69fdb0a55 adjusted file name after it was renamed 2014-10-29 22:47:47 +01:00
Jan Steemann 0d232e9601 removed debug output 2014-10-29 22:47:31 +01:00
Jan Steemann 1865b8bd57 jslint 2014-10-29 22:42:52 +01:00
Jan Steemann 0903c1b9b6 use more precomputed values in expressions 2014-10-29 21:41:00 +01:00
Jan Steemann f0fc42645b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/jsunity.js
2014-10-29 21:34:55 +01:00
Jan Steemann fde483293d fix tests return value 2014-10-29 21:31:00 +01:00
Willi Goesgens 5c8b7854a4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-29 21:11:27 +01:00