1
0
Fork 0
Commit Graph

26867 Commits

Author SHA1 Message Date
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
Frank Celler 22d0f3049b added boost link test 2016-02-24 21:04:42 +01:00
Frank Celler 0ef991de91 removed debug output 2016-02-24 20:35:50 +01:00
Jan Steemann cd6a9d4988 cleanup 2016-02-24 20:12:46 +01:00
hkernbach e0e3896bd1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 19:57:17 +01:00
hkernbach f5674fd76e dev version of new aql editor, grunt 2016-02-24 19:57:08 +01:00
Frank Celler fb8965d4b7 fixed manual pages 2016-02-24 19:56:47 +01:00
Jan Steemann 5ee8493c39 cleanup 2016-02-24 19:51:12 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 0a88fb3dfa removed superfluous file 2016-02-24 19:20:36 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Frank Celler 2f3fe0feea added LDFLAGS for APPLE 2016-02-24 18:57:15 +01:00
Jan Steemann e61aec11dd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 18:52:09 +01:00
Frank Celler df0fe99d5e fixed merge conflict 2016-02-24 18:47:27 +01:00
Frank Celler 6e851249e3 fixed superfluous _stop 2016-02-24 18:40:33 +01:00
hkernbach 028ccfb3c7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 18:31:44 +01:00
Jan Steemann 97968b81dc fixed potential undefined behavior 2016-02-24 18:28:46 +01:00
Jan Steemann 63d1d5339f cppcheck 2016-02-24 17:55:36 +01:00
Jan Steemann 4bbccedf0d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 17:46:40 +01:00
Jan Steemann af367a3e13 fixed range optimizations 2016-02-24 17:43:17 +01:00
hkernbach c38975092a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 17:36:37 +01:00
Andreas Streichardt 370dbebec8 Allow existing directories during init 2016-02-24 17:31:14 +01:00
Andreas Streichardt c69696bc85 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 17:01:12 +01:00
Max Neunhoeffer 15865ccae4 Fix startLocalCluster script? 2016-02-24 16:56:50 +01:00
Wilfried Goesgens bf7b3a86f7 Remove the libevent compatibility wrapper from the build targets, we don't need it and its broken on windows. 2016-02-24 16:10:15 +01:00
Wilfried Goesgens aa6e229a3d Add triagens force header for windows, as we did before. 2016-02-24 16:08:59 +01:00
Wilfried Goesgens 3833d9e462 Swap sequence for visual studio. 2016-02-24 16:08:43 +01:00
Max Neunhoeffer b072a01f7c Fix buildIndexValues. 2016-02-24 15:59:32 +01:00
Max Neunhoeffer d02ae8e7d1 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-24 15:48:19 +01:00
Max Neunhoeffer aaaa50c6d0 Many index changes, compiles, does not run well. 2016-02-24 15:47:57 +01:00
Jan Steemann c72eee052b only close if fd is > 2 2016-02-24 15:29:00 +01:00
Michael Hackstein a5442d19f3 Fixed a bug in expandInSearch values. And removed temporary test hack. 2016-02-24 14:46:21 +01:00
Wilfried Goesgens 0bf90a712a Add version, and way to detect local boost. 2016-02-24 14:04:19 +01:00
Andreas Streichardt dbc71272be Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 13:44:38 +01:00
Max Neunhoeffer 02c1438b42 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-24 13:30:36 +01:00
Michael Hackstein 9727a1f3a8 Started to add an implementation tu multiply queries with IN. THis is identical for all indexes and does not check validity. The general idea is that an index does not need to know anything about AND, OR, IN. It just has to know primitive types like EQ, LE, LT, GE, GT. 2016-02-24 13:29:26 +01:00
Max Neunhoeffer cff2624e4a Add operator!= for Slice. 2016-02-24 12:45:00 +01:00
Max Neunhoeffer 7b8309bf7c New VPack hash method for Slice. 2016-02-24 11:43:10 +01:00
hkernbach 3f3dbc5391 removed old icon 2016-02-24 10:59:57 +01:00