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

3628 Commits

Author SHA1 Message Date
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann e946729306 aqlvalue$ 2016-03-08 18:52:34 +01:00
Jan Steemann 0496f99b21 expression now using VelocyPack 2016-03-08 13:03:03 +01:00
Michael Hackstein 15b4d0734a Added a generic getAndCheckNumeric value to VPackHelper 2016-03-07 19:03:40 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Jan Steemann be8a520ab8 removed dead code 2016-03-04 14:52:15 +01:00
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +01:00
jsteemann 0c580f1076 removed unused includes 2016-03-04 02:37:20 +01:00
jsteemann 630c8f44aa use correct includes 2016-03-04 02:30:47 +01:00
jsteemann 053648b36c simplifications 2016-03-04 02:25:18 +01:00
jsteemann c2c509ef58 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 21:27:13 +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
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +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
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +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 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
Jan Steemann 90bf212f54 fixed shutdown issues 2016-03-02 14:56:30 +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 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 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 0770a4b665 Fix TRI_V8ToVPack to always deliver if no error is returned. 2016-03-02 10:33:09 +01:00
Jan Steemann 285de1998b velocypack 2016-03-01 17:54:57 +01:00
Wilfried Goesgens ac16a39315 Shut up visual studio, we know this is UTF-8. 2016-03-01 17:43:29 +01:00
Michael Hackstein d3a53cd9bf Replaced the word tokenizer TRI_string_vector_t version by a std::vector<std::string> version 2016-03-01 13:39:17 +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 4845b3fc93 cleanup 2016-02-26 23:07:19 +01:00
jsteemann 76129430b4 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 22:49:27 +01:00
jsteemann 6d228eabaa use forwarding 2016-02-26 22:49:06 +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 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