1
0
Fork 0
Commit Graph

27117 Commits

Author SHA1 Message Date
Wilfried Goesgens 59d7aa435d don't override the provided output directory. 2016-03-03 16:07:03 +01:00
Jan Steemann 62a88fd4d8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 15:40:13 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Andreas Streichardt 35aac377c1 Proper naming 2016-03-03 14:42:47 +01:00
Jan Steemann cd5c9d9ae3 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 14:33:50 +01:00
Jan Steemann 57634adaa8 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 14:23:45 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Max Neunhoeffer d545702efa Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 13:24:33 +01:00
Andreas Streichardt fc9a6496a5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-03 13:07:18 +01:00
Andreas Streichardt 121d0cea8f Correct directory 2016-03-03 13:07:04 +01:00
Michael Hackstein 65cf9efefe Replaced another TRI_associative with a std::vector for Auth. Also replace TRI_vocbase_auth_cache_t by a proper CXX class VocbaseAuthCache. 2016-03-03 11:35:30 +01:00
Simran Brucherseifer b18e5e788b Spelling in changelog 2016-03-03 10:43:32 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
jsteemann b35f44a5d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 22:09:44 +01:00
jsteemann 60ac50e5c6 cppcheck 2016-03-02 22:09:32 +01:00
Andreas Streichardt 3524ee829f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-02 18:58:57 +01:00
Andreas Streichardt 8bc9815488 Add proper debian cpack 2016-03-02 18:58:15 +01:00
Frank Celler df4df0d17f no -Wall for libev 2016-03-02 17:55:41 +01:00
Jan Steemann a09d517d9e fixed warning 2016-03-02 17:55:02 +01:00
Wilfried Goesgens ff6ecda6e2 grr 2016-03-02 17:54:41 +01:00
Wilfried Goesgens 488149e424 comment out everything for WSACleanup 2016-03-02 17:52:46 +01:00
Jan Steemann fa759ec787 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 17:51:12 +01:00
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