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

635 Commits

Author SHA1 Message Date
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 48d0a1cbb5 micro optimizations 2016-04-21 12:46:53 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Jan Steemann 386fee8099 updated vpack library 2016-04-19 13:44:53 +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
Frank Celler f85c700d20 silence some warnings 2016-04-19 07:35:03 +02:00
Jan Steemann 917a1744c9 updated vpack library 2016-04-18 15:30:26 +02:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Wilfried Goesgens e173d26aa9 remove directory mangling for our old windows special library directory mechanism 2016-04-14 13:38:52 +02:00
Wilfried Goesgens 8ae9ed7b4e Only need to install icu data files on windows, others have them hardwired at build time. 2016-04-14 10:46:04 +02:00
Wilfried Goesgens 2c7cfac728 Add routine to install the ICU character table database 2016-04-13 15:37:50 +02:00
Jan Steemann 51bfb8fe57 remove TRI_json_t 2016-04-12 16:37:36 +02:00
Jan Steemann 7c934b43e9 updated library 2016-04-11 13:27:21 +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
Andreas Streichardt 4c540e8330 Backport from spdvpk 2016-04-05 14:15:15 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler 5da239ac1e fixed warnings 2016-04-03 13:48:19 +02:00
Wilfried Goesgens 519e4a038f Disable usage of cygwin inside of generated msvs project files. 2016-03-31 15:54:49 +02:00
Wilfried Goesgens 75450a3fae Fix V8 build for windows 
- use <(PYTHON_EXECUTABLE) its a gyp variable not an environment variable.
  - disable fetching of platform json for visual studio.
 2016-03-31 14:35:32 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Wilfried Goesgens 1ccb985109 Forward patch missing changes to the V8 build for windows/solaris/arch linux 2016-03-31 10:55:17 +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 c95dc5df3d remove obsolete cmakelists 2016-03-24 19:03:58 +01:00
Andreas Streichardt 11e7808641 Hopefully fix unittest boost fun 2016-03-24 19:01:34 +01:00
Max Neunhoeffer ad8cad6d01 Velocypack fixes for assembler. 2016-03-24 00:47:21 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Kaveh Vahedipour 90a085975d missing overrides 2016-03-23 17:39:16 +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
Jan Steemann 7c245bd3a3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:21 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Michael Hackstein e8fc45a107 Temporary fix in VelocyPack parser. Will be included in the base library 2016-03-23 16:24:07 +01:00
Kaveh Vahedipour 65475361f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 15:37:08 +01:00
Kaveh Vahedipour d239fb8e7f merging into devel 2016-03-23 15:36:48 +01:00
Andreas Streichardt b610ba3894 Remove godep link 
trolololol...procfs dependency has a symlink here:

https://github.com/prometheus/procfs/blob/master/fixtures/26231/exe

etcd out of source build will copy the src tree.
cmake copy doesn't support symlinks and will copy the symlinks target.
the symlink is hardcoded to /usr/bin/vim

This means that arangodb needed an installed vim :S

Incredible fail chain
 2016-03-23 15:24:30 +01:00
Andreas Streichardt b3357a644e Fix remaining invalid python commands 2016-03-23 14:43:02 +01:00
Andreas Streichardt f449aeb6c3 Fix python versioning in newer v8 2016-03-23 13:45:07 +01:00
Kaveh Vahedipour 4f152db27f Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-23 08:59:10 +00: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 30f826ff8c fixed libs 2016-03-20 13:43:29 +00:00
Frank Celler e785284c5b removed -Wshorten-64-to-32 2016-03-20 13:53:20 +01:00
Frank Celler 949ec7074b set deployment target 2016-03-20 13:51:45 +01:00
Frank Celler 46c1844dc1 replied fix 2016-03-20 13:37:20 +01:00
Frank Celler 6e3555b828 V4.9.391 2016-03-20 13:21:08 +01:00
Frank Celler e6f02486d4 no think archive 2016-03-20 10:12:04 +00:00
Frank Celler c97d35c986 fixed USE_PRECOMPILED_V8 2016-03-20 10:41:17 +01:00