1
0
Fork 0
Commit Graph

26705 Commits

Author SHA1 Message Date
Andreas Streichardt 2c65416f3d one cluster dir is enough...log agency stuff 2016-02-22 18:26:54 +01:00
Andreas Streichardt 319a19434c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-22 18:16:14 +01:00
Andreas Streichardt c9bb0f1eeb custom data dir 2016-02-22 18:15:02 +01:00
Jan Steemann 4d9c132a0a moved edgesQuery to AQL/Vpack 2016-02-22 17:50:12 +01:00
hkernbach 130f5f97dd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-22 17:47:06 +01:00
hkernbach 5b733abceb bugfixes webui 2016-02-22 17:46:58 +01:00
Andreas Streichardt 025bb3da51 cmake build locations vs. startLocalCluster 2016-02-22 17:36:45 +01:00
Michael Hackstein deef8c3c42 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-22 17:18:15 +01:00
Jan Steemann a756ac8343 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:59:07 +01:00
hkernbach 3b7d837f8d grunt build 2016-02-22 16:56:45 +01:00
hkernbach 7f8a9e8a49 collection view bugfix 2016-02-22 16:52:42 +01:00
Jan Steemann 28b1fcfe1b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:52:31 +01:00
Jan Steemann 49181147e4 truncate optimization 2016-02-22 16:52:18 +01:00
Wilfried Goesgens e44a3b3645 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-02-22 16:46:39 +01:00
Wilfried Goesgens e27bdf7a01 Merge branch 'solaris' of github.com:arangodb/ArangoDB into solaris 2016-02-22 16:42:47 +01:00
Wilfried Goesgens cffad306d0 More fixes to the libev cmake 2016-02-22 16:42:28 +01:00
Jan Steemann 3e2e14d800 truncate() 2016-02-22 16:30:56 +01:00
Frank Celler 44832697d2 moved build.h 2016-02-22 16:30:53 +01:00
hkernbach 8b43486035 scss 2016-02-22 16:29:38 +01:00
Frank Celler a9afad6257 checkout tarball 2016-02-22 16:29:04 +01:00
Jan Steemann d1aaddd8c3 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:48 +01:00
Jan Steemann f07054bf6a Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:42 +01:00
Jan Steemann 7efe1c6091 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:37 +01:00
Frank Celler 1c7e2acfb1 added include directories 2016-02-22 16:17:16 +01:00
Michael Hackstein 39d022c4d3 Fixed compile error that only occured in Maintainer mode. 2016-02-22 16:11:21 +01:00
Michael Hackstein a2a52c6ea5 Fixed usage of collection type in RestDocumentHandler 2016-02-22 16:09:51 +01:00
Michael Hackstein 1367368b38 Added a version for ScanIndex with CursorType::Any 2016-02-22 15:42:57 +01:00
hkernbach 4329125165 fixed graph router bug 2016-02-22 15:33:20 +01:00
hkernbach a311ec9036 removed deprecated offsetWidth, offsetHeight 2016-02-22 15:11:14 +01:00
hkernbach aa382da33b removed deprecated webkitURL 2016-02-22 15:07:13 +01:00
hkernbach 5d53b15104 removed sync calls 2016-02-22 15:01:50 +01:00
Wilfried Goesgens c194235963 solaris also trips on -wl,--version 2016-02-22 15:01:04 +01:00
Wilfried Goesgens 137b82409c swap sequence, so the exception gets thrown later. 2016-02-22 14:06:40 +01:00
Jan Steemann 840062af8d all() 2016-02-22 14:03:50 +01:00
Michael Hackstein c9aaabf8e6 Added call to hasMore and getMore on OperationCursor in v8-query 2016-02-22 14:02:25 +01:00
Michael Hackstein ef4f3790bc Added OperationCursor to cmake file. Fixed compile errors 2016-02-22 14:02:03 +01:00
hkernbach 867c1fa8c1 bugfixes, removed more sync calls 2016-02-22 13:56:12 +01:00
Michael Hackstein fd9c60d651 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-22 13:53:34 +01:00
Michael Hackstein bbd6ee4c12 Added implementation for operation cursor 2016-02-22 13:53:27 +01:00
Wilfried Goesgens 0a0aa11b42 re-add Z & EV to the library directories. 2016-02-22 13:52:52 +01:00
Jan Steemann b9d7fc479c fixed warning 2016-02-22 13:30:17 +01:00
Wilfried Goesgens a98b3946f9 - Remove default config.h - it doesn't contain the wanted values in most cases.
- add checks to generate config.h from cmake.
2016-02-22 13:29:21 +01:00
Wilfried Goesgens 03f402d842 Move apple specific cflag modifications into a proper if clause. 2016-02-22 13:28:46 +01:00
Michael Hackstein b7f1803e35 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-22 13:25:59 +01:00
Michael Hackstein e9054fdf29 Added a All iterator for the primary index and made it available in the transaction 2016-02-22 13:25:51 +01:00
Max Neunhoeffer ff6da8ffe4 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-22 13:02:30 +01:00
Max Neunhoeffer 82e017fd9a Add TRI_vpack_sub_t. 2016-02-22 13:02:17 +01:00
Jan Steemann 2a627d419d removed unused method 2016-02-22 12:42:28 +01:00
Jan Steemann ea3a7f3dab removed cap constraints 2016-02-22 12:37:16 +01:00
Jan Steemann b8f71ccfdb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 12:26:45 +01:00