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

309 Commits

Author SHA1 Message Date
Wilfried Goesgens 1763c5dc36 Revert #366d771b5247c271f9dbf22905e7f3d49e0d974c and set the policies for ubuntu. 2016-05-10 11:06:40 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
ArangoDB a51f795b82 Merge branch 'devel' into json_agency_comm 2016-05-04 19:49:22 +00:00
Frank Celler 59aef959ac changed to static 2016-05-04 19:45:55 +02:00
Kaveh Vahedipour 35d604e9e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 18:17:00 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
Wilfried Goesgens b163692df7 fix python detection. This line got lost. 2016-05-04 15:20:56 +02:00
jsteemann 7ad08738af Merge branch 'devel' of https://github.com/arangodb/arangodb into dox-cox-pix-ex-rox-box 2016-05-04 14:54:45 +02:00
Andreas Streichardt a80d208590 Use core2 as the absolute minimum architecture 2016-05-04 14:33:32 +02:00
Frank Celler d5fd6ac0e7 fixed order of pthread, fixed cmake 2.8 2016-05-04 13:51:16 +02:00
Kaveh Vahedipour 5d911bceb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:36 +02:00
jsteemann 495b266c8a initial commit 2016-05-03 15:42:24 +02:00
Frank Celler 27454a1281 added USE_OPTIMIZE_FOR_ARCHITECTURE flag 2016-05-03 14:18:58 +02:00
Wilfried Goesgens d19cef695e Unify the way we locate and initialize icu on windows in the unittests. 2016-05-03 11:43:14 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Frank Celler 6974f881a3 fixed statistics 2016-05-01 19:14:10 +02:00
Kaveh Vahedipour 86959d83a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:29:05 +02:00
Andreas Streichardt 241dd2ff15 link against libatomic on clang 2016-04-29 12:49:36 +02:00
Kaveh Vahedipour 583a77792f sometimes elseif(NOT CMAKE_SIZEOF_VOID_P) 2016-04-29 10:00:47 +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