1
0
Fork 0
Commit Graph

27095 Commits

Author SHA1 Message Date
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
Wilfried Goesgens 7696297038 Disable WSACleanup for now, we don't know the right time to call it in all cases. 2016-03-02 17:50:45 +01:00
Wilfried Goesgens 1b207c885e Add libev error handler. 2016-03-02 17:48:54 +01:00
Andreas Streichardt c4847dd8a8 Do not install zlib 2016-03-02 17:15:49 +01:00
Wilfried Goesgens 25f6311972 Add visual studio user setting file, so we don't need to configure the debugger options each time. 2016-03-02 16:20:15 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00
Michael Hackstein fc06d7eaa0 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-02 15:46:46 +01:00
Michael Hackstein d95c4954a4 Removed shape from ExampleMatcher. Also TRI_json_t variant is non functional anymore. It is DEPRECATED and will be removed very very soon 2016-03-02 15:46:32 +01:00
Wilfried Goesgens f5d14029c8 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 15:36:25 +01:00
Jan Steemann aff37523fe Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:32:05 +01:00
Jan Steemann a6124247d4 fixed threading issues 2016-03-02 15:27:31 +01:00
Jan Steemann 6b3550e148 thread issues 2016-03-02 15:21:53 +01:00
Jan Steemann 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Andreas Streichardt 7356982d89 remove if 2016-03-02 15:14:57 +01:00
Max Neunhoeffer 071b653d29 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-03-02 15:02:25 +01:00
Max Neunhoeffer c1995cbb8a Add debian folder to Installation. 2016-03-02 15:02:02 +01:00
Jan Steemann 7a087730d1 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 14:58:21 +01:00
Jan Steemann ba40edac87 less json 2016-03-02 14:58:13 +01:00
Jan Steemann 98f5eadebe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-02 14:56:39 +01:00
Jan Steemann 90bf212f54 fixed shutdown issues 2016-03-02 14:56:30 +01:00
Frank Celler 9342b0bab9 be verbose 2016-03-02 14:08:18 +01:00
Michael Hackstein 56f0e927cf unshapified VocBase/auth. Also replaced TRI_AssociativeList with an unordered_map. 2016-03-02 13:12:04 +01:00
Frank Celler c719beccc4 added BASE_LD_FLAGS and BASE_LIBS 2016-03-02 12:45:04 +01:00
Jan Steemann 1f6b0abaa5 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 12:42:30 +01:00
Michael Hackstein d2febf9a58 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-02 12:39:52 +01:00
Michael Hackstein 5153750abe Added a function to invoke a callback on all elements in a collection within a transaction. 2016-03-02 12:39:37 +01:00
Jan Steemann 66ee7e600d less json 2016-03-02 11:58:28 +01:00
Wilfried Goesgens f1a2f5e393 Styleguide cleanups as cmakelinter hints 2016-03-02 11:45:55 +01:00
Jan Steemann b209accf29 removed json 2016-03-02 11:34:31 +01:00
Max Neunhoeffer 9da16d66a0 Fix bugs in Transaction replace method for babies. 2016-03-02 11:32:49 +01:00
Wilfried Goesgens 5c152e9923 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 11:32:28 +01:00
Jan Steemann 0887c50c8f fixed logger initialization and shutdown 2016-03-02 11:31:41 +01:00
Jan Steemann 87a7b0ec36 fixed logger shutdown 2016-03-02 11:29:54 +01:00
Jan Steemann fe86b1c017 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:05:13 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Jan Steemann 2a63d04289 fix assertions in non-maintainer mode 2016-03-02 11:04:29 +01:00
Max Neunhoeffer 738e595df3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-02 10:59:39 +01:00
Jan Steemann 91ca37facb Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 10:54:29 +01:00
Jan Steemann 4271879c08 fix assertions in non-debug builds 2016-03-02 10:54:12 +01:00
Jan Steemann e6e864cd7a removed unused functions 2016-03-02 10:53:59 +01:00
Max Neunhoeffer 9a1acd1833 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-02 10:53:57 +01:00
Max Neunhoeffer 0f883dc0c8 Adjust replace to new TRI_V8ToVPack. 2016-03-02 10:53:06 +01:00
Wilfried Goesgens 78d3bd28b5 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 10:50:28 +01:00
Wilfried Goesgens ae428829fc Merge branch 'solaris' of github.com:arangodb/ArangoDB into solaris 2016-03-02 10:50:15 +01:00
Michael Hackstein 4e5f24a869 Removed unnacessary imports of shape 2016-03-02 10:45:00 +01:00
Max Neunhoeffer 0770a4b665 Fix TRI_V8ToVPack to always deliver if no error is returned. 2016-03-02 10:33:09 +01:00
Wilfried Goesgens 318cdb8365 Merge branch 'solaris' of github.com:arangodb/ArangoDB into devel 2016-03-02 10:31:03 +01:00
Wilfried Goesgens e39871ae10 We need to specify use_snapshot=true for gyp. 2016-03-02 09:59:23 +01:00
Frank Celler 8d7734b2bc removed no-old-style 2016-03-01 23:56:42 +01:00
hkernbach 22da5c3b13 grunt 2016-03-01 20:07:49 +01:00