1
0
Fork 0
Commit Graph

316 Commits

Author SHA1 Message Date
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
threez fe02d691d8 Fixes compile issue on FreeBSD/clang
lib/Basics/logging.cpp:1876:12: error: cannot initialize a variable of type 'CODE *' (aka '_code *') with an lvalue of type 'const CODE [25]'
    CODE * ptr = TRI_facilitynames;
           ^     ~~~~~~~~~~~~~~~~~

FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512
Target: x86_64-unknown-freebsd10.1
2014-11-26 15:05:43 +01:00
Jan Steemann 34eb2a8c5a removed unused functions 2014-11-25 23:18:45 +01:00
Jan Steemann 9846fd0d36 removed unused function 2014-11-24 17:36:11 +01:00
Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions
Conflicts:
	CHANGELOG
2014-11-20 14:23:01 +01:00
Frank Celler ec37174083 fixed syslog 2014-11-18 18:16:29 +01:00
Jan Steemann f1f13a4284 added several AQL functions 2014-11-18 11:26:42 +01:00
Frank Celler 77fd12b987 fixed SimpleHttpClient 2014-11-14 23:50:00 +01:00
Jan Steemann 1303595594 Visual Studio does not like thread_local 2014-11-14 17:39:01 +01:00
Jan Steemann 777f70c8e2 fixed error message 2014-11-14 16:45:51 +01:00
Jan Steemann 2622f57e07 added assertions 2014-11-13 14:15:47 +01:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
Jan Steemann 81c1919f44 minor adjustments for task API 2014-11-12 11:27:47 +01:00
Jan Steemann 5bf964ad5b issue #1086: arangoimp: Odd errors if arguments are not given properly 2014-11-06 12:07:12 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Jan Steemann cf6fcb2fc1 linted python files, regenerated derived files 2014-10-29 23:56:20 +01:00
Jan Steemann 8bb213e7ba sort and cache list expression values
emplace

fixed wrong assertion
2014-10-29 01:02:20 +01:00
Jan Steemann f6b8f17dfa less optimizations for simple plans 2014-10-28 15:01:44 +01:00
Jan Steemann 2808e4eee8 cppcheck 2014-10-28 00:35:18 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann ccf7e4f131 mini cleanup 2014-10-27 22:47:36 +01:00
Jan Steemann 7452c70a3b moved backtrace functions 2014-10-27 18:15:10 +01:00
Jan Steemann 29a4416bcf issue #1056: added tests for zipFile / unzipFile
Conflicts:
	js/common/tests/shell-fs.js
	lib/BasicsC/tri-zip.c
2014-10-25 01:21:47 +02:00
Jan Steemann bc4ae8e7df fixed leak in IndexOperator, simplified IndexOperator API 2014-10-24 12:57:09 +02:00
Willi Goesgens adf6391968 Make it const, baby. 2014-10-22 17:34:39 +02:00
Willi Goesgens 7bf11c9aaf Add method which returns a printeable string which type a json structure is. 2014-10-21 12:42:57 +02:00
Jan Steemann ee614d6ebd v8 context handling 2014-10-17 15:25:06 +02:00
Max Neunhoeffer 183cd3eb40 Sort out temporary directory creation with individual names. 2014-10-16 20:08:21 +02:00
Jan Steemann bb0e11499d fixed races reported by helgrind 2014-10-16 19:32:14 +02:00
Jan Steemann 64fd7ea4b3 conversions 2014-10-16 10:20:04 +02:00
Jan Steemann 688e8ebbc1 better support for handling multipart requests 2014-10-16 02:05:57 +02:00
Jan Steemann e37f45253f fixed return code of mtime 2014-10-15 18:24:01 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann 6511fec7c6 added tests for fs.read and fs.write 2014-10-15 12:44:04 +02:00
Jan Steemann 6ab535bd06 nullptr 2014-10-14 15:14:38 +02:00
Jan Steemann 95cfbd7051 test fix 2014-10-14 11:18:16 +02:00
Jan Steemann 47fece8a22 removed sleep 2014-10-14 11:03:42 +02:00
Jan Steemann 47bd3f060b increased sleep 2014-10-14 10:52:25 +02:00
Jan Steemann ae99fbda3a added usleep for testing 2014-10-14 10:43:40 +02:00
Jan Steemann f09e440539 fix attempt 2014-10-14 10:27:11 +02:00
Jan Steemann 4a7164a84d removed signal handler that didn't help 2014-10-14 10:15:22 +02:00
Jan Steemann ada372f123 removed debug output 2014-10-13 13:01:12 +02:00
Jan Steemann 41ae9c8ea7 SIGCHLD 2014-10-13 12:32:22 +02:00
Jan Steemann 294d89c5e3 fixed illegal checkExternalProcess call 2014-10-13 11:34:21 +02:00
Jan Steemann 77d3433a5a fixed usage of uninitialized variable 2014-10-13 11:12:46 +02:00
Jan Steemann 1ba2030e0b debug info 2014-10-13 11:10:12 +02:00
Willi Goesgens cb50ceafa6 If we're to early for the forked process, wait & Retry. 2014-10-10 14:52:27 +02:00
Jan Steemann d9cc80bab7 fixes for Visual Studio 2014-10-10 14:37:03 +02:00
Jan Steemann 31ebe14ea6 issue #1042 2014-10-10 14:24:22 +02:00