1
0
Fork 0
Commit Graph

26705 Commits

Author SHA1 Message Date
Jan Steemann d83a873d85 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 15:34:17 +01:00
Jan Steemann 78f4e26a5b removed non-existing file 2016-02-25 15:34:06 +01:00
Jan Steemann ab6d46f641 adjust travis instructions after file move 2016-02-25 15:24:00 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Michael Hackstein 45a75bf4c6 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-25 14:38:43 +01:00
Michael Hackstein 7b42fc7ae8 Unified lookup in PrimaryIndex to use identical format as HashIndex lookup does 2016-02-25 14:38:39 +01:00
Jan Steemann f0ed218ae9 do not compile v8 with -Werror 2016-02-25 14:25:22 +01:00
Jan Steemann e5140c80a2 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:03:10 +01:00
Jan Steemann 2ee4dad77b TransactionContext is now the resource owner 2016-02-25 14:02:57 +01:00
Jan Steemann b1988c94b8 reduce variance in generated man pages 2016-02-25 13:48:50 +01:00
Michael Hackstein 647cdc0ffe Implemented a indexScan iterator for Primary Index and moved the AQL iterator for it to VPack as well. Right now the AQL iterator is not functional is the memory management is not yet working. 2016-02-25 13:47:31 +01:00
Jan Steemann 51eb138c94 reduce build verbosity 2016-02-25 13:38:35 +01:00
AutoBuilder df1c591f51 Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris 2016-02-25 14:26:16 +01:00
AutoBuilder 325a045fef added link flags 2016-02-25 14:26:12 +01:00
Frank Celler 38cb961a33 removed superfluous Makefile 2016-02-25 13:19:50 +01:00
Frank Celler 942061d74a added hints about MacOSX and gcc5 2016-02-25 13:18:33 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Michael Hackstein ce1fff1727 Remove unused variables 2016-02-25 13:03:57 +01:00
Michael Hackstein ef5e0fdd1a Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-25 13:03:28 +01:00
Michael Hackstein 367f6c28e1 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-25 12:45:29 +01:00
Michael Hackstein c509b60e11 Added a function to transform the Index Search Value of HashIndex to the Index-Key 2016-02-25 12:45:20 +01:00
Jan Steemann 3c6391279e cleanup 2016-02-25 12:24:04 +01:00
Jan Steemann 0b815931a7 fixed crud operations 2016-02-25 11:49:11 +01:00
Frank Celler d7bd642ed1 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 11:19:38 +01:00
Jan Steemann 031b251190 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 11:13:46 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
hkernbach 1e78f8aae6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-25 10:34:25 +01:00
hkernbach ff2f4d089f grunt 2016-02-25 10:34:08 +01:00
hkernbach aadab3a0e4 new query view 2016-02-25 10:33:58 +01:00
Frank Celler 5a0c65970c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-25 10:21:17 +01:00
Frank Celler 4d996bd189 added new program options and application features 2016-02-25 10:21:09 +01:00
Jan Steemann 382a76c784 jslint 2016-02-25 10:12:36 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 86b7becdb6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-25 00:00:42 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
hkernbach e5c1577f89 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 23:45:46 +01:00
hkernbach fc7fdd6572 query view 2016-02-24 23:45:38 +01:00
Frank Celler cb6f4c024b fixed boost unittests test 2016-02-24 23:43:07 +01:00
Frank Celler 554cf0594a changed order of V8 and ICU 2016-02-24 23:17:24 +01:00
jsteemann 3b548b568c removed unused old makefiles 2016-02-24 23:12:00 +01:00
jsteemann cac9526926 removed dependency on regex.h 2016-02-24 23:06:46 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Frank Celler 8c632cae24 Merge branch 'solaris' of github.com:arangodb/arangodb into solaris
Conflicts:
	CMakeLists.txt
2016-02-24 22:41:00 +01:00
Frank Celler 42dbf45264 fixed libs 2016-02-24 22:40:31 +01:00
Frank Celler ea44c604b6 fixed boost 2016-02-24 22:39:53 +01:00
Frank Celler f66df14cf8 only regenerated README in maintainer mode 2016-02-24 21:31:16 +01:00
Frank Celler abdb83dfb7 generate README 2016-02-24 21:26:47 +01:00