Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
27,781 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

3572 Commits

Author SHA1 Message Date
jsteemann 67514b60b6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 21:56:26 +01:00
jsteemann a0cec69852 added some features 2016-02-26 21:45:41 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +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
Jan Steemann c0fd3b13ca Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 10:19:17 +01: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
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +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 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Jan Steemann 5ee8493c39 cleanup 2016-02-24 19:51:12 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Jan Steemann e61aec11dd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 18:52:09 +01:00
Frank Celler 6e851249e3 fixed superfluous _stop 2016-02-24 18:40:33 +01:00
Kaveh Vahedipour 86be0136ec agency on 2016-02-24 18:26:32 +01:00
Jan Steemann 4bbccedf0d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 17:46:40 +01:00
Jan Steemann c72eee052b only close if fd is > 2 2016-02-24 15:29:00 +01:00
Frank Celler 43be85e72b more cleanup 2016-02-24 10:30:30 +01:00
jsteemann 24e1669f04 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 00:22:25 +01:00
Frank Celler 017d5fa904 sanity check for stopped WorkMonitor 2016-02-23 23:07:08 +01:00
Frank Celler 0f1a8e66d5 removed old cpp files 2016-02-23 15:28:32 +01:00
Frank Celler 8f747d9496 switch to ARANGODB_ZLIB_VERSION 2016-02-23 15:28:31 +01:00
Frank Celler 9fca3425a1 cleanup 2016-02-23 15:28:31 +01:00
Frank Celler 4ea37fde68 fixed error handling 2016-02-23 15:27:36 +01:00
Frank Celler bed46519f9 added DETACHED state 2016-02-23 15:27:36 +01:00
Frank Celler 04bd7da430 do not attach if not started 2016-02-23 15:27:36 +01:00
Frank Celler bede0ee12c removed unecessary autoconf files 2016-02-23 15:27:35 +01:00
Frank Celler d07ed63e5e use Thread instead of thread.h 2016-02-23 15:27:35 +01:00
Frank Celler d61e2cd0dd do not use GETTID 2016-02-23 15:27:35 +01:00
Frank Celler 06f48be072 check for CREATED on shutdown 2016-02-23 15:27:35 +01:00
Frank Celler 022a5f457c cleanup of TRI_ options 2016-02-23 15:27:35 +01:00
Frank Celler d53b65a2f8 cleanup of OS defines 2016-02-23 15:27:34 +01:00
Frank Celler 0639e688f5 added FLEX and BISON 2016-02-23 15:27:34 +01:00
Frank Celler 6fa4e319bb simplified init 2016-02-23 15:26:22 +01:00
Frank Celler 24649f44bd move to strings and away from regexp 2016-02-23 15:25:07 +01:00
Frank Celler 5b0d9e2ef6 cleanup of unsed variables 2016-02-23 15:25:06 +01:00
Frank Celler ef6f83d05a removed abort 2016-02-23 15:25:05 +01:00
Frank Celler 97cfcce407 stop monitor on shutdown 2016-02-23 15:25:05 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Frank Celler 987da8d434 fixed error handling 2016-02-23 12:26:12 +01:00
Frank Celler a140ad9de2 added DETACHED state 2016-02-23 12:26:12 +01:00
Frank Celler 31d659a46b do not attach if not started 2016-02-23 12:26:12 +01:00
Frank Celler 2c9e8380ca removed unecessary autoconf files 2016-02-23 12:26:11 +01:00
Frank Celler 9889b549b3 use Thread instead of thread.h 2016-02-23 12:26:11 +01:00
Frank Celler 9bc7af22e1 do not use GETTID 2016-02-23 12:26:11 +01:00
Frank Celler 8a473c1f5b check for CREATED on shutdown 2016-02-23 12:26:11 +01:00
Frank Celler 963578180a cleanup of TRI_ options 2016-02-23 12:26:10 +01:00
Frank Celler e269b97517 cleanup of OS defines 2016-02-23 12:26:10 +01:00
Frank Celler 97e80b848e added FLEX and BISON 2016-02-23 12:26:10 +01:00
Frank Celler ef71f52a24 simplified init 2016-02-23 12:26:10 +01:00
Frank Celler d142a5ddb4 move to strings and away from regexp 2016-02-23 12:26:09 +01:00
Jan Steemann 558dddcfed Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 09:15:13 +01:00
Frank Celler 0d60101c17 removed abort 2016-02-23 00:27:52 +01:00
Frank Celler 75d464ab8b stop monitor on shutdown 2016-02-22 22:33:41 +01:00
Jan Steemann 49181147e4 truncate optimization 2016-02-22 16:52:18 +01:00
Kaveh Vahedipour c9a7af6d93 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-02-22 16:51:29 +01:00
Frank Celler 44832697d2 moved build.h 2016-02-22 16:30:53 +01:00
Jan Steemann 7efe1c6091 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:37 +01:00
Kaveh Vahedipour 1f9414f3ea Agencing on 2016-02-19 18:58:53 +01:00
Jan Steemann e4fb8b184b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:51:52 +01:00
Frank Celler 417db335ab removed old files 2016-02-19 12:26:26 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Jan Steemann adde757e46 move v8 try-catch into handle scopes 2016-02-19 11:42:44 +01:00
Max Neunhoeffer ac7a3e6d6a Switch off assembler CRC32 on Windows by default. 2016-02-19 10:59:13 +01:00
Max Neunhoeffer f95860c143 Sort out _ chaos in assembler source. 2016-02-19 10:32:59 +01:00
jsteemann 62130d3239 locking-related bugfixes 2016-02-19 00:31:28 +01:00
Kaveh Vahedipour 2dcb98b5e9 Adapting to intel compiler 15.0 2016-02-18 23:26:30 +01:00
Jan Steemann 433cd14d7e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 14:44:05 +01:00
Frank Celler bf54539770 local-configuration.h is no longer needed 2016-02-18 14:11:25 +01:00
Frank Celler 5de6c354a9 added warning, removed local-configuration, bumped version 2016-02-18 14:02:40 +01:00
Michael Hackstein 7ed6754389 Fixed usage of document, to also include customTypeHandler for export to V8 2016-02-18 13:21:06 +01:00
Jan Steemann d7963c651b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 12:55:49 +01:00
Max Neunhoeffer 57fd044c4b First experiment with intrinsics. 2016-02-18 12:41:40 +01:00
Kaveh Vahedipour 3076549984 OSX does not use .size and .type in object file format 2016-02-18 10:46:39 +01:00
Jan Steemann 8e32e6e888 remove unused parameter 2016-02-18 09:38:47 +01:00
Max Neunhoeffer 2ef2ec7292 Add assembler optimized CRC version. 
Compile in only if architecture is x86_64 and no user override.
If compiled in, use runtime detection of SSE4.2 extensions using
the CPUID intrinsic.
 2016-02-17 23:17:23 +01:00
Frank Celler a5e804ab70 added cancel 2016-02-17 22:19:52 +01:00
Frank Celler 345712c36f changed to new Thread interface 2016-02-17 22:19:37 +01:00
Max Neunhoeffer 459e3abf07 Put in new CRC polynomial. 
Also remove initialization stuff for CRC hashes string case.
Adjust unittests.
 2016-02-17 11:59:36 +01:00
Jan Steemann 7e6c20a3ef Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 16:42:10 +01:00
Kaveh Vahedipour 0a89dcaae5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-16 15:38:24 +00:00
Kaveh Vahedipour 6f348eec86 Logger handles now operator<< std::vector and std::unordered_list. And etcd builds. 2016-02-16 15:38:06 +00:00
Jan Steemann a3b0bb83d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 15:39:02 +01:00
Michael Hackstein 8295bae5b3 Added generated files 2016-02-16 14:07:10 +01:00
Michael Hackstein 32d0e48d61 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-16 13:56:08 +01:00
Michael Hackstein 9900b006a9 Indention fix 2016-02-16 10:30:00 +01:00
Jan Steemann 64f85c526b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 09:53:36 +01:00
Alan Plum 1c4b0f5da1 Remove obsolete JS error codes 2016-02-15 22:56:34 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Jan Steemann f3b2f6e9f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-15 17:03:00 +01:00
Jan Steemann 90c89717b8 make v8 compile with VS 2015 2016-02-15 12:48:39 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Jan Steemann d32b2b62e5 set file descriptor properly 2016-02-15 09:56:40 +01:00
Jan Steemann 7ff95c4ec4 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-15 09:36:02 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Jan Steemann b734e4c228 don't log to the same output multiple times 2016-02-12 19:12:56 +01:00
Jan Steemann 20aebf6cc0 fix some Visual Studio 2015 errors 2016-02-12 19:10:52 +01:00
Jan Steemann 13cceddbcc removed linenoise option 2016-02-12 18:07:42 +01:00
Jan Steemann 3545663d16 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-12 17:29:45 +01:00
Wilfried Goesgens 1c8acea215 On solaris we need to hide ERR... 2016-02-12 17:03:31 +01:00
Wilfried Goesgens d85e19c902 Depending on which solaris version we compile at, these facilities can be unknown. 2016-02-12 17:03:24 +01:00
Wilfried Goesgens ee94d45bea Use fcntl instead of flock, this is more modern and better portable. 2016-02-12 17:03:16 +01:00
Jan Steemann fcd3f116ee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-12 16:33:46 +01:00
Kaveh Vahedipour 389ddf3e8c Much requested farsi goodbye added. 2016-02-12 14:10:27 +00:00
Kaveh Vahedipour 05ef0d2711 linenoise library should be automatically included 2016-02-12 12:44:05 +00:00
Jan Steemann 81fe7dd4b8 don't log to same output channel multiple times 2016-02-12 12:22:56 +01:00
Jan Steemann b739708f1d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-12 11:32:39 +01:00
Jan Steemann b8849daa50 fix invalid fix 2016-02-12 10:41:09 +01:00
Jan Steemann 16d1a6f7a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-11 21:56:50 +01:00
Jan Steemann 9898103bc1 initial vpack documents 2016-02-11 21:56:10 +01:00
Kaveh Vahedipour fe9370afb4 Pre merge into devel 2016-02-11 13:00:50 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
jsteemann bca7bee317 don't copy 2016-02-10 23:07:56 +01:00
Michael Hackstein 335abd5640 Added a helper function to transform any VPack value to a double. This is conistent with V8 Json to double 2016-02-09 16:50:39 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Kaveh Vahedipour 8e07620109 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 17:10:37 +00:00
Jan Steemann 2f5b9e8ace nicer exceptions 2016-02-08 17:27:45 +01:00
Kaveh Vahedipour b99970ef72 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 16:17:36 +01:00
jsteemann 78bc8e6997 remove unused thread cleanup method 2016-02-07 00:22:22 +01:00
jsteemann d2001b6c0a fixed leak 2016-02-07 00:06:38 +01:00
Jan Steemann 17ea3f422d dont use dynamic memory for condition variable initialization 2016-02-05 19:37:45 +01:00
Jan Steemann 99b79acb61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:20:32 +01:00
Frank Celler d6808f8d6f fixed deadlock on fatal 2016-02-05 16:40:33 +01:00
Wilfried Goesgens 4b864f0643 In solaris try to call pstack in case of failing asserts 2016-02-05 14:55:52 +01:00
Wilfried Goesgens 21707e1710 Output a log message before exiting false in maintainer mode. 2016-02-05 14:55:18 +01:00
Jan Steemann f172dd90d4 prevent crash in case TRI_LookupArrayJson is called on invalid data 2016-02-05 14:24:01 +01:00
Kaveh Vahedipour 2b6a0ceaa5 Added simple piping of VP slices into Logger streams. 2016-02-05 10:49:19 +00:00
Jan Steemann d63fa1ad81 use dedicated REPLICATION log channel 2016-02-05 11:01:39 +01:00
Kaveh Vahedipour 43e2cff79c Added simple piping of VP slices into Logger streams. 2016-02-05 09:23:09 +00:00
Jan Steemann 51d4df998d cleanup 2016-02-04 19:12:27 +01:00
Wilfried Goesgens 4d1f8a5164 Move solaris specific stuff into its own header. 2016-02-04 17:54:46 +00:00
Jan Steemann 9ff2684f92 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 18:41:36 +01:00
Jan Steemann a6353c053f fixed Windows build 2016-02-04 18:41:13 +01:00
Wilfried Goesgens a13432a988 Fix solaris compile 2016-02-04 17:38:42 +00:00
Jan Steemann 35e2284146 don't malloc log string twice 2016-02-04 17:47:26 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Michael Hackstein 84b1f9055d Further implementation of VPackAqlValue functions. This included VALUES and ATTRIBUTES. These functions by accident had an ordering in TRI_json_t which they do not have any more in VelocyPack. Clarified Documentation. 2016-02-04 13:49:59 +01:00
Jan Steemann 3269c59a06 fixed some compile warnings 2016-02-04 12:38:51 +01:00
Jan Steemann 0ff20a6590 try to work around compiler warning 2016-02-04 12:32:56 +01:00
Jan Steemann 5964ecb005 removed unused function 2016-02-04 11:10:42 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Jan Steemann 657ac8d50f fixes for Windows 2016-02-04 09:36:29 +01:00
Jan Steemann b7fddb15ad handle compile warnings 2016-02-04 09:07:36 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Kaveh Vahedipour a4623a395d Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-03 09:33:25 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
jsteemann 74bf32d723 more detailed logging for mmap operations, added mmap log section 2016-02-02 21:36:25 +01:00
Kaveh Vahedipour eb94d0a0d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-02 15:05:00 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann bc6fce75d4 removed some unnecessary explicits 2016-02-02 12:13:21 +01:00
Kaveh Vahedipour 2c776cac26 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 17:48:56 +01:00
Jan Steemann 998f106361 argl 2016-02-01 17:17:21 +01:00
Michael Hackstein c782fe5917 Use VPackCollection::merge to merge to VPackSlices. 2016-02-01 17:10:25 +01:00
Jan Steemann 9a0204a656 fixed compile error 2016-02-01 16:57:41 +01:00
Kaveh Vahedipour 7db958580a Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 15:01:22 +01:00
Kaveh Vahedipour 56be55c7a3 OSX does not allow static_cast from pthread_t to unsigned long 2016-02-01 13:59:46 +00:00
Kaveh Vahedipour c045f0ae48 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:50:16 +01:00
jsteemann 1a3e042496 attempt to fix warning with clang on Mac 2016-02-01 14:49:12 +01:00
Kaveh Vahedipour 3a6ce7bc03 Merge branch 'cmakification' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:24:22 +01:00
Kaveh Vahedipour 749e765535 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:22:43 +01:00
Kaveh Vahedipour 6194a83437 making progress building unix versions 2016-02-01 13:06:06 +00:00
jsteemann 6d735086ac honor clang-check results 2016-02-01 13:20:49 +01:00
jsteemann 3aed47d8e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-01 13:15:05 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Kaveh Vahedipour 99b0ca712e Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 13:02:15 +01:00
Max Neunhoeffer daf2afe71a Merge branch 'devel' into ClustUp2 2016-02-01 12:30:45 +01:00
Jan Steemann 33061cab76 fixed Windows build 2016-02-01 12:23:43 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Kaveh Vahedipour 22cc984f84 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 11:02:31 +00:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Jan Christoph Uhde ed9856da40 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb: (166 commits)
  added deadlock test
  more logging
  fixed filename order in Makefile
  removed unused functions and headers
  removed `using namespace std`
  fix g++ complaint about exceeding variable tracking size
  honor results of clang-test, clang-tidy and clang-modernize
  Documentation: Web Interface-bind parameter example added
  fix or annotate problems identified by clang-check
  fixed leak
  fixed warnings shown by clang-3.7
  Documentation: Parameters Binding links
  Documentation: Aql with ArangoDB Web Interface
  fixed compile error in non-maintainer-mode
  removed last LOG_xxx macros
  remove TRI_ENABLE_LOGGING
  use Logger
  more files using the Logger
  logger transition: all files in arangod exception transactions.cpp
  added setLevel
  ...
 2016-02-01 10:00:46 +01:00
Michael Hackstein b85d5d4a26 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 09:49:29 +01:00
Michael Hackstein 9ea8e3ea0c Started to write merge of two slices. This is not yet working for null means delete, works for all other merges. 2016-02-01 09:49:19 +01:00
jsteemann 54c796b6e8 fixed issues identified by `-fsanitize=undefined` 2016-01-31 23:30:41 +01:00
Jan Christoph Uhde 03409a84cc fix icu related linking issues 2016-01-31 23:06:24 +01:00
jsteemann 349a6d9754 more logging 2016-01-31 21:48:59 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann 5bfd12a0ce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-30 01:08:59 +01:00
jsteemann dbd5c500cb remove TRI_ENABLE_LOGGING 2016-01-30 00:46:40 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
Frank Celler 44a519b89e added setLevel 2016-01-29 23:25:05 +01:00
Jan Steemann c47eef63b5 added missing header 2016-01-29 20:05:16 +01:00
Frank Celler eef111f4ae added Logger 2016-01-29 19:23:24 +01:00