1
0
Fork 0
Commit Graph

292 Commits

Author SHA1 Message Date
Frank Celler 6974f881a3 fixed statistics 2016-05-01 19:14:10 +02:00
Andreas Streichardt 241dd2ff15 link against libatomic on clang 2016-04-29 12:49:36 +02:00
Frank Celler daae5917ad added icu copy 2016-04-28 08:57:31 +02:00
Frank Celler 10cea5553f no ASM under Windows 2016-04-27 17:26:07 +02:00
jsteemann 5ec9cff904 renamed arangob to arangobench 2016-04-27 12:15:19 +02:00
Frank Celler d5476d37b1 remove USE_SYSTEM_BOOST 2016-04-27 11:04:57 +02:00
Frank Celler 0d8de0612c remove USE_SYSTEM_BOOST 2016-04-27 10:51:12 +02:00
Frank Celler 1976f2f5b6 fixed wrong usage of error 2016-04-23 22:17:36 -07:00
Frank Celler 2cb73ce625 cosmetics 2016-04-23 22:14:57 -07:00
Frank Celler 3091b17ab9 do not use v8_build in precompiled mode 2016-04-23 19:30:42 -07:00
jsteemann 07a0e0156d add fix vor Visual Studio 2015 update 2 2016-04-23 21:30:29 +02:00
jsteemann f9b872e77e remove unnecessary libraries 2016-04-22 16:13:53 +02:00
Frank Celler 7bc8669bbf ignore #warning 2016-04-21 23:15:47 -07:00
Wilfried Goesgens 51bca63463 Add detection for jemalloc, default to using jemalloc on linux. 2016-04-21 18:22:52 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 98423f451e
Don't generate mimetypes.js 2016-04-18 18:19:24 +02:00
Frank Celler 999cf52996 fixed order of flags 2016-04-17 17:27:30 -07:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Frank Celler ae45b7cd67 MSVC fixes 2016-03-31 17:16:37 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Andreas Streichardt d0f58ffac3 Fix python executable 2016-03-30 14:19:48 +02:00
Frank Celler 9095e57fb3 fixed tcmalloc test 2016-03-28 22:08:28 +02:00
Jan Steemann eddc92a228 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 19:35:23 +01:00
Andreas Streichardt 11e7808641 Hopefully fix unittest boost fun 2016-03-24 19:01:34 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Andreas Streichardt fb76cc4529 fix python 2016-03-23 18:25:41 +01:00
Kaveh Vahedipour 7746fbfe82 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 17:19:56 +01:00
Jan Steemann 7ae7b18d25 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 17:09:49 +01:00
Frank Celler 212a1e7813 fixed buffer overflow 2016-03-23 16:41:22 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Frank Celler 2dd1f1ce1f cache deployment target 2016-03-20 13:59:47 +01:00
Frank Celler 949ec7074b set deployment target 2016-03-20 13:51:45 +01:00
Frank Celler 9a8678f712 no rt on darwin 2016-03-20 13:01:03 +01:00
Frank Celler 019c95a777 added rt 2016-03-20 08:45:49 +00:00
jsteemann 3759c19886 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 16:52:59 +01:00
Frank Celler f1aabef0fe removed /LTCG 2016-03-18 16:29:51 +01:00
Kaveh Vahedipour 7355cde795 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-16 16:27:53 +01:00
jsteemann d6709de403 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 12:12:19 +01:00
Frank Celler 174b0d661c changed to 3.0.x-devel 2016-03-16 10:50:52 +01:00
jsteemann 0361c2e72b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 00:13:58 +01:00
jsteemann 6204de9ed9 always link against libresolv 2016-03-16 00:13:30 +01:00
jsteemann 2ceecda5f7 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:44:42 +01:00
Frank Celler d64bf2dc95 added srv:// endpoint 2016-03-15 23:25:07 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00