1
0
Fork 0
Commit Graph

37119 Commits

Author SHA1 Message Date
Michael Hackstein 13a1f15116 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:26:46 +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
jsteemann 7640586bd9 added test case for duplicate collections 2017-03-06 13:07:04 +01:00
jsteemann 19830d8dee Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 12:58:22 +01:00
Mark bf8f0b7be8 fixed windows compile error 2017-03-06 12:24:20 +01:00
Michael Hackstein 7afccbd6e9 Fixed forward declarition. Struct vs. class 2017-03-06 10:48:37 +01:00
Michael Hackstein b26ea6c3bd Added a recovery test for duplicate-name creation. This was broken during Engine-API build. 2017-03-06 10:41:21 +01:00
Michael Hackstein 02da035eb7 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 09:13:45 +01:00
Michael Hackstein b6ac3c65ad Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-06 09:13:37 +01:00
jsteemann 9954b52f34 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 08:19:24 +01:00
Frank Celler ab49f6c1b4 fixed variables parsing in GraphQL 2017-03-05 23:31:38 +01:00
Frank Celler da27597ff4 fixed missing double quote 2017-03-05 23:29:08 +01:00
Jan Christoph Uhde 664acb8695 Change link order of static libs 2017-03-05 18:54:46 +01:00
Jan Christoph Uhde d44c48842c clean up bootstrap.sh 2017-03-05 15:42:21 +01:00
Jan Christoph Uhde 15f71ceae5 Add gcc-arango as compiler in bootstrap script. 2017-03-05 13:48:05 +01:00
Jan Christoph Uhde 6a7d47bbd4 init v8 2017-03-05 09:37:56 +01:00
Jan Christoph Uhde 845040f8a3 add bootstrap script 2017-03-05 04:04:33 +01:00
Jan Christoph Uhde d4000ebf70 Add hexdump when vaidation fails for incoming VPackSlice 2017-03-03 22:38:04 +01:00
jsteemann b3f11af7a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 17:42:22 +01:00
jsteemann b4cdafaef9 cleanup 2017-03-03 16:53:48 +01:00
jsteemann e4c27b0f44 flush log thread buffer when we're logging with fatal|err|warn levels 2017-03-03 16:53:03 +01:00
jsteemann d01c45b636 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 15:04:29 +01:00
jsteemann b06ba1696c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 15:04:01 +01:00
jsteemann 6478c6d043 updated CHANGELOG 2017-03-03 15:03:52 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
Michael Hackstein f42b3196e1 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-03 13:44:27 +00:00
Michael Hackstein 16c43192a0 Fixed feature startup ordering because recovery of presistent indices doid fail 2017-03-03 13:40:17 +00:00
jsteemann 7dfb37d94b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-03 13:26:59 +01:00
jsteemann b3b427c660 fixed issue #2350 2017-03-03 13:26:44 +01:00
Wilfried Goesgens d5cd299bd3 add missing client package copy step 2017-03-03 13:17:09 +01:00
jsteemann f89399e585 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 12:47:01 +01:00
jsteemann 356020a3c6 try to make test more deterministic, by not relying on a wait time of 5 seconds 2017-03-03 12:35:12 +01:00
jsteemann 3a39921147 fixed documentation and added tests for grants API 2017-03-03 12:33:13 +01:00
jsteemann db9099f0f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 12:07:50 +01:00
jsteemann cdf8fbac7f fixed misleading documentation 2017-03-03 12:05:05 +01:00