1
0
Fork 0
Commit Graph

688 Commits

Author SHA1 Message Date
jsteemann 28930370c2 micro optimizations 2016-04-23 20:49:22 +02:00
jsteemann f9b872e77e remove unnecessary libraries 2016-04-22 16:13:53 +02:00
Jan Steemann 7f30e30c1d fixed crash 2016-04-21 18:04:10 +02:00
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
Frank Celler 165d6c18bd missing files 2016-03-20 00:16:55 +01:00
Frank Celler 9a2da21d53 flatten 2016-03-19 22:39:20 +01:00
Frank Celler 55e43a9823 fixed typo 2016-03-19 22:22:44 +01:00
Frank Celler 42b2cb5baf removed '()', because msbuild does not like it 2016-03-19 22:15:07 +01:00
Frank Celler bf6882a92f VS 2016-03-19 19:23:48 +01:00
Frank Celler f5e6f534ab removed -Wshorten-64-to-32 2016-03-19 16:47:13 +01:00
Frank Celler f0c0257d8f removed pyc files 2016-03-18 21:48:46 +01:00
Frank Celler 5a1e8fd6fe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 20:20:15 +01:00
jsteemann 62058d4900 allow turning off SSE4_2 variants 2016-03-18 19:39:53 +01:00
jsteemann a2413a8ab3 updated vpack library 2016-03-18 17:41:13 +01:00
jsteemann 3759c19886 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 16:52:59 +01:00
Frank Celler d7d89645fd fixed link target for zlibstatic under Windows 2016-03-18 15:48:48 +01:00
Frank Celler 4ed9b382dd fixed windows lib 2016-03-18 15:38:26 +01:00
Kaveh Vahedipour d6db18d655 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-18 10:45:15 +01:00
Frank Celler 6d19bdbbfe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 09:50:20 +01:00
jsteemann 47a9ea189b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 22:57:25 +01:00
Wilfried Goesgens 551ab11a2c Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-03-17 22:07:29 +01:00
Wilfried Goesgens e398ac6e97 Finalize detection of NuGet installed OpenSSL 2016-03-17 21:40:14 +01:00
jsteemann a9ab4eaace Merge branch 'devel' of https://github.com/arangodb/arangodb into v8 2016-03-17 21:13:21 +01:00
jsteemann 996299cea3 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 17:17:50 +01:00
jsteemann 534a31f211 added V8_CFLAGS, V8_CXXFLAGS, V8_LDFLAGS 2016-03-17 16:44:37 +01:00
Wilfried Goesgens 6f69cdf6c1 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-17 12:30:03 +01:00
Kaveh Vahedipour 5acdc36d07 Construct builder with prefilled buffer. Agency store increment, decrement, push pop 2016-03-16 23:40:53 +01:00
jsteemann 04ebf65521 updated vpack library 2016-03-16 20:42:39 +01:00
jsteemann d3213915bf Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 17:53:59 +01:00
Kaveh Vahedipour 7355cde795 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-16 16:27:53 +01:00
Andreas Streichardt edf378053e Do not build etcd in source 2016-03-16 14:22:29 +00:00
Frank Celler 0f1e19559e added V8 2016-03-16 10:18:57 +01:00
Frank Celler 7c1287a9d7 added gyp 2016-03-16 10:04:50 +01:00
Frank Celler 40ec6079d6 added missing files 2016-03-16 09:13:23 +01:00
Frank Celler 41e0519cdb added missing icu 2016-03-15 23:42:23 +01:00
Frank Celler bd601caee2 fixed include 2016-03-15 23:12:04 +01:00
Frank Celler ca608f1293 fixed number 2016-03-15 22:25:36 +01:00
Frank Celler 109c4e43eb 4.9.391 2016-03-15 22:08:31 +01:00
Frank Celler 50286c1ef7 V8 4.9.391 2016-03-15 21:43:46 +01:00
Wilfried Goesgens 7b7a852dcc Fix quotes, thanks to Simran for digging this out. 2016-03-15 21:29:21 +01:00
jsteemann 236aa3ab5f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 20:09:51 +01:00
Frank Celler ae8430589f new linenoise-ng 2016-03-15 16:54:53 +01:00
Kaveh Vahedipour 8bf2264e88 null result for non-existent key in agency dbs 2016-03-15 16:28:27 +01:00
Wilfried Goesgens 7c18cbdd51 Implement configuring for 32 bit arm 2016-03-15 15:16:55 +01:00
Wilfried Goesgens e2bf40a78a better insulate the flags where forcing 64 bits for solaris. 2016-03-15 15:12:19 +01:00
Max Neunhoeffer 646367f955 Move change in VelocyPack Builder ValuePair String API here. 2016-03-14 21:24:29 +01:00
Max Neunhoeffer c074f47f4e Port a velocypack fix. 2016-03-14 12:12:54 +01:00
Jan Steemann 4074ba47ee fixed invalid member name 2016-03-11 09:12:02 +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
Jan Steemann 9a26fe0960 attribute accessor not using json 2016-03-08 09:59:57 +01:00