1
0
Fork 0
Commit Graph

20468 Commits

Author SHA1 Message Date
Willi Goesgens 44101c621d Fix macos warning: declaring & calling in one line seems to be undeclared. 2015-03-24 11:33:19 +01:00
Jan Steemann 95defabf05 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-24 11:12:05 +01:00
Jan Steemann 16348cd10c added tests 2015-03-24 11:11:55 +01:00
Willi Goesgens 3b773c0c49 Fix cluster arangob tests 2015-03-24 10:48:28 +01:00
Jan Steemann 66e2273482 added documentation for UPSERT 2015-03-24 00:44:52 +01:00
Jan Steemann cbee2c6466 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-23 22:28:58 +01:00
Jan Steemann 7d5cc17d98 added tests 2015-03-23 22:28:26 +01:00
Willi Goesgens 1a269dcee1 Fix sequence so TRI_BINDIR_INSTALL is defined. 2015-03-23 19:07:56 +01:00
Willi Goesgens 9fbfcf245e more places to remove mruby 2015-03-23 19:05:29 +01:00
Willi Goesgens c4ecaffbb4 Remove MRuby from the macos build 2015-03-23 18:58:55 +01:00
Willi Goesgens ac141a4e14 options.test is always there - need to check whether its defined. 2015-03-23 18:45:46 +01:00
Willi Goesgens 486d86e0cb add new file from a1af44bf4900600f54d4b8dc233429df488633db to CMake too. 2015-03-23 17:47:34 +01:00
Willi Goesgens e188d142e0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-23 17:06:43 +01:00
Willi Goesgens fad2e60895 Fix windows compile of getenv facilities 2015-03-23 17:06:09 +01:00
Thomas Schmidts 0e0a7c47ab Fixed broken Links in Foxx/Install/README 2015-03-23 16:12:52 +01:00
Jan Steemann ac44597788 removed unused files 2015-03-23 15:46:31 +01:00
Jan Steemann c62c26e088 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-23 15:31:41 +01:00
Jan Steemann e3bf1c709c upsert blocks 2015-03-23 15:31:07 +01:00
Willi Goesgens 03d40f8f9e Add complex modification sample. 2015-03-23 14:57:32 +01:00
Willi Goesgens 287a1978ec Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-23 14:27:36 +01:00
Willi Goesgens 7b438b3968 lintify 2015-03-23 14:27:11 +01:00
Willi Goesgens a775c410b0 Output http replies if verbose set and an error occurs. 2015-03-23 14:26:38 +01:00
Willi Goesgens 0988508e33 Add ability to pass through args to arangob 2015-03-23 14:25:37 +01:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Frank Celler dc860ef976 fixed wrong error message 2015-03-23 13:45:19 +01:00
Willi Goesgens 2869f7c325 Show error messages in all conditions, show error count for non-complete reqlies. 2015-03-23 13:22:39 +01:00
Willi Goesgens d8d0196b85 Add tests for the environment handling. 2015-03-23 11:18:20 +01:00
Willi Goesgens 6ec5920057 don't let the mac-fix break linux ;-) 2015-03-23 11:15:46 +01:00
Frank Celler 8950175eac added external 2015-03-23 10:51:14 +01:00
Frank Celler 3c52dcde6d changed _api/query to C++
Conflicts:
	CHANGELOG
	Makefile.in
	README
	arangod/RestServer/ArangoServer.cpp
2015-03-23 10:51:14 +01:00
Willi Goesgens 0d593de325 Add filter of testcases based on the --test parameter. 2015-03-23 10:44:42 +01:00
Jan Steemann cace25bd55 added generated file 2015-03-23 08:22:14 +01:00
Max Neunhoeffer 5bb07bbd9e Change localhost to 127.0.0.1 for GCE. 2015-03-22 23:39:29 -07:00
Frank Celler e2dd4507f3 removed debian files, they are now in obs 2015-03-21 11:12:03 +01:00
Jan Steemann 3b6dfc868e Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-20 23:23:13 +01:00
Jan Steemann ecd8f15c15 free thread name string on shutdown 2015-03-20 23:19:06 +01:00
Jan Steemann facc9bceea trap killing of AQL queries inside subqueries 2015-03-20 23:07:39 +01:00
Jan Steemann d63f47e840 added possibility to kill JS traversals 2015-03-20 23:05:41 +01:00
Jan Steemann 186c25f3bb Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-20 22:03:18 +01:00
Jan Steemann 075e1a0fb4 updated CHANGELOG 2015-03-20 21:59:46 +01:00
Jan Steemann cc8ec1750c fixed function name in error message 2015-03-20 21:55:50 +01:00
Jan Steemann 8e48f98045 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification
Conflicts:
	arangod/Aql/Collection.cpp
	arangod/Aql/ExecutionBlock.cpp
2015-03-20 21:54:39 +01:00
Jan Steemann d512b5fa35 issue #1282: Geo WITHIN_RECTANGLE for nested lat/lng 2015-03-20 19:27:30 +01:00
Willi Goesgens 220607e815 fix memset to null the proper pointer. 2015-03-20 15:12:46 +01:00
Willi Goesgens 0004073ce9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-20 13:56:52 +01:00
Willi Goesgens 8d1980bf11 initialize the ZIP-structure. 2015-03-20 13:56:14 +01:00
Jan Steemann 573bc7c486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-20 13:35:28 +01:00
Jan Steemann ee906c698f increase default timeout 2015-03-20 13:35:21 +01:00
Willi Goesgens 07b3720e6d Fix windows error buffer handling 2015-03-20 13:21:59 +01:00
Willi Goesgens f1c1cc385d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-20 13:21:02 +01:00