1
0
Fork 0
Commit Graph

3421 Commits

Author SHA1 Message Date
Kaveh Vahedipour e3aa0fdd1f Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-11 09:10:40 +01:00
Frank Celler 5cac7abb5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-10 23:00:22 +00:00
Frank Celler 46b702b2cb fixed colors 2016-03-10 22:59:51 +00:00
Wilfried Goesgens 8eb24c3a40 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-10 23:28:12 +01:00
Wilfried Goesgens ddc5369949 test for OPENSSL_NO_SSL3_METHOD; this fixes #1773 2016-03-10 23:26:36 +01:00
Frank Celler ab6224e2ae cleanup 2016-03-10 23:02:59 +01:00
Frank Celler f4335d4a7e fixed color output 2016-03-10 21:56:29 +00:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Frank Celler 6dbb6ceb03 changed newline for windows 2016-03-10 14:22:26 +00:00
Frank Celler e68fa98154 fixed colors 2016-03-10 12:05:44 +00:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
Frank Celler ce28f5492f convert to escape-x notation 2016-03-09 16:29:40 +01:00
Frank Celler 2d09d64d8f convert to escape-x notation 2016-03-09 16:25:37 +01:00
Frank Celler 8632644886 removed warning 2016-03-09 10:57:14 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
jsteemann ffc36b1841 prevent duplicate logging 2016-03-03 21:20:05 +01:00
Kaveh Vahedipour 89ce4ac10a Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-03 18:50:40 +01:00
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +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
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 f5d14029c8 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 15:36:25 +01:00
Jan Steemann a6124247d4 fixed threading issues 2016-03-02 15:27:31 +01:00
Jan Steemann 90bf212f54 fixed shutdown issues 2016-03-02 14:56:30 +01:00
Wilfried Goesgens f1a2f5e393 Styleguide cleanups as cmakelinter hints 2016-03-02 11:45:55 +01:00
Jan Steemann 0887c50c8f fixed logger initialization and shutdown 2016-03-02 11:31:41 +01:00
Jan Steemann 2a63d04289 fix assertions in non-maintainer mode 2016-03-02 11:04:29 +01:00
Wilfried Goesgens ac16a39315 Shut up visual studio, we know this is UTF-8. 2016-03-01 17:43:29 +01:00
Frank Celler 2a3ee1f9a4 cleanup includes 2016-02-29 17:44:26 +01:00
Frank Celler 32685a1c69 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-29 17:15:11 +01:00
Wilfried Goesgens c86e1508a3 Fix renaming of max/min -> maximum/minimum 2016-02-29 13:59:11 +01:00
Frank Celler 1d1538212a Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris 2016-02-27 19:52:30 +00:00
Kaveh Vahedipour f4ffae0433 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-02-27 11:34:10 +01:00
jsteemann 05094a2370 initialize variable 2016-02-26 22:33:32 +01:00
jsteemann 1dc877db5d allow or disallow overriding options 2016-02-26 22:31:44 +01:00
jsteemann a0cec69852 added some features 2016-02-26 21:45:41 +01:00
Kaveh Vahedipour 0ac54c3300 agency on 2016-02-26 17:44:14 +01:00
Wilfried Goesgens d755808a3e Windows portability 2016-02-26 17:06:56 +01:00
Frank Celler 5927a22bd8 added functional 2016-02-26 14:09:01 +00:00
Max Neunhoeffer 7c2979275d Fix a defined around SSL. 2016-02-26 08:53:59 +00:00
Kaveh Vahedipour 34976d462f agency on 2016-02-26 09:31:05 +01:00
Frank Celler 06256947fa splitted into 3rd libs 2016-02-25 18:51:17 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Frank Celler 5a0c65970c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-25 10:21:17 +01:00
Frank Celler 4d996bd189 added new program options and application features 2016-02-25 10:21:09 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00