1
0
Fork 0
Commit Graph

26356 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
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
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 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 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
Jan Steemann c72eee052b only close if fd is > 2 2016-02-24 15:29:00 +01:00
Andreas Streichardt dbc71272be Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-24 13:44:38 +01:00
hkernbach 3f3dbc5391 removed old icon 2016-02-24 10:59:57 +01:00
jsteemann ca9f5f1709 removed redundant test 2016-02-24 00:21:20 +01:00
jsteemann b3a3aa3f80 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-24 00:20:50 +01:00
jsteemann 6ff60602de fixed more recovery tests 2016-02-24 00:20:42 +01:00
Frank Celler 43161c264e t push
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2016-02-23 23:23:43 +01:00
Frank Celler 41ab5647e6 added recover --test 2016-02-23 23:23:37 +01:00
jsteemann 8212de5c70 fixed recovery tests 2016-02-23 23:21:23 +01:00
Frank Celler 017d5fa904 sanity check for stopped WorkMonitor 2016-02-23 23:07:08 +01:00
Frank Celler 8edc06daf3 addeed log output 2016-02-23 22:32:28 +01:00
jsteemann b2ecc039c6 fixed looukp path 2016-02-23 22:24:10 +01:00
jsteemann 47b684a75a fixed maintainer mode 2016-02-23 21:49:57 +01:00
Frank Celler 48e39567fc fixed man page generation 2016-02-23 21:28:14 +01:00
hkernbach c66a480db9 user view bugfix, grunt 2016-02-23 19:00:56 +01:00
hkernbach cfe62a9f9a grunt 2016-02-23 13:27:35 +01:00
hkernbach d8383a0cf5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-23 13:27:14 +01:00
hkernbach fa5ece041f html, scss 2016-02-23 13:27:07 +01:00
Jan Steemann 3380360a0c fix compiler warning 2016-02-23 13:23:02 +01:00
Jan Steemann 188b6696d2 fix compiler warning 2016-02-23 13:21:01 +01:00
Frank Celler 987da8d434 fixed error handling 2016-02-23 12:26:12 +01:00
Frank Celler a140ad9de2 added DETACHED state 2016-02-23 12:26:12 +01:00
Frank Celler 5237860213 fixed wrong comparison for .tmp 2016-02-23 12:26:12 +01:00
Frank Celler 31d659a46b do not attach if not started 2016-02-23 12:26:12 +01:00
Frank Celler 2c9e8380ca removed unecessary autoconf files 2016-02-23 12:26:11 +01:00
Frank Celler 9889b549b3 use Thread instead of thread.h 2016-02-23 12:26:11 +01:00
Frank Celler 9bc7af22e1 do not use GETTID 2016-02-23 12:26:11 +01:00
Frank Celler 8a473c1f5b check for CREATED on shutdown 2016-02-23 12:26:11 +01:00
Frank Celler 963578180a cleanup of TRI_ options 2016-02-23 12:26:10 +01:00
Frank Celler e269b97517 cleanup of OS defines 2016-02-23 12:26:10 +01:00
Frank Celler 97e80b848e added FLEX and BISON 2016-02-23 12:26:10 +01:00
Frank Celler ef71f52a24 simplified init 2016-02-23 12:26:10 +01:00
Frank Celler d142a5ddb4 move to strings and away from regexp 2016-02-23 12:26:09 +01:00
hkernbach 24e2dd2f58 scss 2016-02-23 11:36:26 +01:00