1
0
Fork 0
Commit Graph

276 Commits

Author SHA1 Message Date
Alan Plum 98423f451e
Don't generate mimetypes.js 2016-04-18 18:19:24 +02: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
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
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler b1899e9b31 made BASE flags cachable 2016-03-05 17:13:48 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann b965cb5e6e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 20:58:06 +01:00
Andreas Streichardt 68277a734b Python is required for V8 2016-03-04 18:10:38 +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
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +01:00
Wilfried Goesgens 25f6311972 Add visual studio user setting file, so we don't need to configure the debugger options each time. 2016-03-02 16:20:15 +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 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Frank Celler 9342b0bab9 be verbose 2016-03-02 14:08:18 +01:00
Frank Celler c719beccc4 added BASE_LD_FLAGS and BASE_LIBS 2016-03-02 12:45:04 +01:00
Wilfried Goesgens f1a2f5e393 Styleguide cleanups as cmakelinter hints 2016-03-02 11:45:55 +01:00