Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
37,157 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

37157 Commits

Author SHA1 Message Date
Wilfried Goesgens a7e154b27e improve error messages when trying to create indices 2017-03-06 19:10:46 +01:00
Andreas Streichardt 8a79e5fed4 Move last test and remove pathenumerator...was not in use and broken 2017-03-06 19:04:45 +01:00
Andreas Streichardt 89bb878ab8 Merge failures 2017-03-06 18:51:49 +01:00
Andreas Streichardt 6f6e40140c Move icu helper 2017-03-06 18:51:12 +01:00
Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng 2017-03-06 18:34:46 +01:00
Andreas Streichardt 9c25f5afd8 Adjustments for catch 2017-03-06 18:11:14 +01:00
jsteemann aa8160fc3d try to fix non-enterprise compile error 2017-03-06 18:09:43 +01:00
Andreas Streichardt ce3c17e7de Merge branch 'devel' into catch_tests_ng 2017-03-06 17:59:26 +01:00
jsteemann 40abf7c1e2 fix test 2017-03-06 17:47:12 +01:00
Wilfried Goesgens 3eb216d5cf Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2017-03-06 17:42:27 +01:00
Wilfried Goesgens d17cd30e17 add jsonl to the game 2017-03-06 17:42:17 +01:00
jsteemann fd6eba73b4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:41:44 +01:00
jsteemann c2d7412cb3 removed unused files 2017-03-06 17:41:30 +01:00
Michael Hackstein 9b69035f1a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 17:40:46 +01:00
jsteemann aab138a4e6 added input type jsonl 2017-03-06 17:39:44 +01:00
Michael Hackstein 31df7eb527 Fixed error in recovery for duplicate collection name 2017-03-06 17:34:54 +01:00
jsteemann d55e60cb2e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:17:02 +01:00
jsteemann f6414b38ba fixed constructors 2017-03-06 17:14:22 +01:00
jsteemann 39370aac2f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:04:35 +01:00
jsteemann c2a41cb5a2 remove references to MMFiles* 2017-03-06 17:04:23 +01:00
Dan Larkin e4386400cd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-06 10:33:42 -05:00
Frank Celler b14dbe6435 added base class Result and an example FileResult 2017-03-06 10:33:32 -05:00
Dan Larkin db2cabf844 Completed implementation of transactional cache. 2017-03-06 10:31:36 -05:00
jsteemann e495b5fb6c jslint && cppcheck 2017-03-06 16:13:04 +01:00
Frank Celler 4e2a5a13fd added base class Result and an example FileResult 2017-03-06 16:12:16 +01:00
jsteemann 9d3bbd1d89 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 16:08:58 +01:00
jsteemann 8ba2654540 cleanup 2017-03-06 16:08:49 +01:00
Michael Hackstein 42e14c59f4 A MMFiles collection now reads a path if created from a slice. 2017-03-06 16:06:23 +01:00
Michael Hackstein d4dd243946 Alphabetically ordered includeds 2017-03-06 16:04:43 +01:00
jsteemann e27cf1bc5e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 15:55:00 +01:00
Michael Hackstein dccd6d5c1d Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:40:36 +01:00
jsteemann f7b819579d attempt to fix clang build 2017-03-06 15:40:03 +01:00
Michael Hackstein 13a1f15116 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:26:46 +01:00
Max Neunhoeffer d20444d183 Fix two documentation typos. 2017-03-06 15:17:51 +01:00
jsteemann aba8e423b0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 14:59:46 +01:00
jsteemann f23b66194c next g++-5 build attempt for travis 2017-03-06 14:49:32 +01:00
jsteemann bbda3fa9f5 simplified some ostream kirmes 2017-03-06 14:44:56 +01:00
jsteemann bbda879dee use g++-5 2017-03-06 14:43:31 +01:00
jsteemann 62eee2d9bf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 14:31:36 +01:00
jsteemann ca89a25ad8 try to use g++5.4 on travis 2017-03-06 14:31:13 +01:00
jsteemann d8dcba7d48 Revert "fix compile errors in new clangs" 
This reverts commit 43a32b04c4.
 2017-03-06 14:30:47 +01:00
jsteemann c7acebe3c0 Revert "another attempt to fix logger issues" 
This reverts commit c6c9120e33.
 2017-03-06 14:30:42 +01:00
jsteemann 79f6a39c23 fix cppcheck errors 2017-03-06 14:22:03 +01:00
jsteemann 885bc6186f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 14:20:57 +01:00
jsteemann c6c9120e33 another attempt to fix logger issues 2017-03-06 14:20:45 +01:00
Jan Christoph Uhde 2f2b4661bc delete bootstrap script (moved to private repository) 2017-03-06 14:15:59 +01:00
Jan Christoph Uhde 31d0d2b2b8 move bootstrap.sh to scripts 2017-03-06 13:50:54 +01:00
Michael Hackstein 048bdf4cbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 13:28:07 +01:00
jsteemann 219fb4dbcc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 13:25:50 +01:00
jsteemann 43a32b04c4 fix compile errors in new clangs 2017-03-06 13:25:19 +01:00