1
0
Fork 0
Commit Graph

20347 Commits

Author SHA1 Message Date
Max Neunhoeffer e49e4662b1 Fix a warning message. 2015-03-26 14:56:28 -07:00
Max Neunhoeffer 64b2ae4894 Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel 2015-03-26 14:55:21 -07:00
Willi Goesgens 9bc7ec23c6 If we encounter a server error also output the post document. 2015-03-26 17:51:03 +01:00
Willi Goesgens 0690b4943f - Replace the javascript implementation of makeDirectoryRecursive by our native implementation
- fix the native implementation so it doesn't try to create driveletters as directories.
2015-03-26 17:23:57 +01:00
Willi Goesgens 2b04526729 Relax timeout for cluster startup. 2015-03-26 13:45:01 +01:00
Willi Goesgens ca95acc246 Switch commandline argument handling to the new object structure. 2015-03-26 13:44:29 +01:00
Willi Goesgens e5fd202a4d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-26 12:45:01 +01:00
Jan Steemann ac7d084671 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-26 12:23:25 +01:00
Jan Steemann 7eb28dc201 fixed cluster test 2015-03-26 12:23:14 +01:00
Alan Plum 8b77637dd7 Allow non-fq file paths. 2015-03-26 12:22:13 +01:00
Willi Goesgens 1a88322a6f Add new env-test to the makefile. 2015-03-26 12:20:33 +01:00
Michael Hackstein efcd0bd91b Merge branch 'devel' of github.com:arangodb/arangodb into devel
Conflicts:
	js/node/package.json
2015-03-26 11:50:02 +01:00
Jan Steemann be713c0a0e bumped version number 2015-03-26 11:38:10 +01:00
Jan Steemann e09328341c fixed typo in build instructions 2015-03-26 10:42:40 +01:00
Jan Steemann 3bbc03d327 updated version number 2015-03-26 10:42:30 +01:00
Jan Steemann 5599259075 fixed Visual Studio compile errors 2015-03-26 10:34:38 +01:00
Jan Steemann c352ba6a03 small logging refactoring 2015-03-26 03:09:07 +01:00
Jan Steemann e41f528858 added TRI_FlushLogging 2015-03-25 21:02:33 +01:00
Jan Steemann 85fa39681e constified argument 2015-03-25 21:02:13 +01:00
Alan Plum fbd3a411f2 Make sure WAL is flushed so we get ShapedJson back. 2015-03-25 19:04:20 +01:00
Jan Steemann 91be18d0f7 updated documentation 2015-03-25 18:22:43 +01:00
Jan Steemann 0d34dc67e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-25 18:07:04 +01:00
Jan Steemann 4566aa085a add __filename and __dirname to global context also when using internal.load() 2015-03-25 18:06:42 +01:00
Alan Plum b1822be3ad Fixed Aardvark PATCH configuration. 2015-03-25 17:38:50 +01:00
Alan Plum d6d6914b9e Added Foxx.Repository#exists. 2015-03-25 17:19:44 +01:00
Jan Steemann 7ec3a18e04 added internal.options() 2015-03-25 17:08:29 +01:00
Jan Steemann 3555cdb0fe removed unused method 2015-03-25 17:00:47 +01:00
Jan Steemann e230ac11c0 fixed leak 2015-03-25 16:55:45 +01:00
Jan Steemann d567c012c3 added SYS_OPTIONS() to get options 2015-03-25 16:55:24 +01:00
Jan Steemann 9703f04621 fixed wrong return value 2015-03-25 13:03:49 +01:00
Jan Steemann f49eae6dd5 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-25 12:43:44 +01:00
Jan Steemann 2f58e4ea61 small cleanup 2015-03-25 12:42:44 +01:00
Alan Plum c7f9679085 Gotcha: underscore's template method changed in new version. 2015-03-25 11:32:10 +01:00
Alan Plum 33086816a7 Linting. 2015-03-25 10:34:36 +01:00
Jan Steemann 479a66c441 added generated file 2015-03-25 08:58:02 +01:00
Jan Steemann a26c7c7f28 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-25 08:57:33 +01:00
Alan Plum d1fea9c05e Removed unused import. 2015-03-24 23:36:28 +01:00
Alan Plum ff1a9b26e3 Made ShapedJson#_PRINT non-enumerable. Fixes #1289 root cause. 2015-03-24 23:32:30 +01:00
Alan Plum 9afb093e84 Replace bundled backbone extend with npm dep. 2015-03-24 22:58:45 +01:00
Alan Plum e287a1ec7b Updated deps. 2015-03-24 21:51:05 +01:00
Alan Plum 3802085415 Fixed tests. 2015-03-24 21:41:21 +01:00
Alan Plum 202fbdb018 Even more exhaustive tests. 2015-03-24 21:38:27 +01:00
Alan Plum 3a957292fc Make sure _PRINT is gone entirely. 2015-03-24 21:29:42 +01:00
Alan Plum c77e69307c Added ShapedJSON bug to CHANGELOG. 2015-03-24 21:08:50 +01:00
Alan Plum e8834a350a Fixed #1289. 2015-03-24 21:06:28 +01:00
Alan Plum 5e9beaeb5b Linting. 2015-03-24 21:05:11 +01:00
Jan Steemann d5d427520a updated CHANGELOG 2015-03-24 18:43:59 +01:00
Jan Steemann 59053df10a issue #1285: allow bind parameter names starting with underscores 2015-03-24 18:43:53 +01:00
Jan Steemann b98f8f7e29 fix initialization 2015-03-24 18:42:24 +01:00
Jan Steemann d774236379 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-24 18:29:37 +01:00