1
0
Fork 0
Commit Graph

29565 Commits

Author SHA1 Message Date
jsteemann 918a3c05da more diagnoses 2016-05-04 21:49:44 +02:00
jsteemann e821ed9042 removed unused element from TRI_col_header_marker_t 2016-05-04 21:37:24 +02:00
Frank Celler 59aef959ac changed to static 2016-05-04 19:45:55 +02:00
Jan Steemann 0001266c6a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 19:35:16 +02:00
Jan Steemann 2dce04550a fixed crash 2016-05-04 19:35:05 +02:00
Frank Celler 867f186270 added server.uid as alias for uid 2016-05-04 19:03:07 +02:00
Jan Steemann 5c8a9fa922 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 18:37:29 +02:00
Jan Steemann 430b886eb1 added datafile version check 2016-05-04 18:37:03 +02:00
Frank Celler 77c4512b0a fixed parameter 2016-05-04 18:20:43 +02:00
Wilfried Goesgens 737cb058b8 Remove debug output, no more needed in-between-CMakeList.txt 2016-05-04 17:55:14 +02:00
Wilfried Goesgens a520475ee0 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-05-04 17:43:30 +02:00
Michael Hackstein e4a871aea7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 17:32:19 +02:00
Michael Hackstein 262ff9b75e Added a test for intersection with documents directly out of the database. 2016-05-04 17:32:13 +02:00
Wilfried Goesgens c1643864c3 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-05-04 17:30:09 +02:00
Kaveh Vahedipour 9b4cac619f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 17:28:05 +02:00
Kaveh Vahedipour 1b24d19c9c removing local resolution of cmake modules 2016-05-04 17:27:56 +02:00
Wilfried Goesgens 14fe556031 Merge branch 'devel' of github.com:arangodb/ArangoDB into dox-cox-pix-ex-rox-box 2016-05-04 17:27:39 +02:00
Wilfried Goesgens da3a12320a remove debug output 2016-05-04 17:26:47 +02:00
Wilfried Goesgens e3bf9cf42f use cmake inside of rocksdb for linux too. 2016-05-04 17:18:21 +02:00
Michael Hackstein 669eeeae9a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 17:16:17 +02:00
Michael Hackstein d4baf62d20 Activated Externals by default in OperationCursor. This is used in some places and should have a positive performance impact 2016-05-04 17:16:10 +02:00
Frank Celler 366d771b52 removed wrong version 2016-05-04 17:09:29 +02:00
jsteemann 2c9eb69dc5 cppcheck 2016-05-04 17:02:15 +02:00
Jan Steemann 0f93405a1d fixed compile warnings 2016-05-04 16:48:47 +02:00
Jan Steemann 4d4174a1ac Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:47:18 +02:00
Michael Hackstein 62f2d55c20 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 16:46:13 +02:00
Michael Hackstein 4f674220ab Added brute force tests in AQL functions. 2016-05-04 16:45:59 +02:00
jsteemann 42c9394797 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:42:44 +02:00
jsteemann 852a6d7829 fixed compile warning 2016-05-04 16:42:37 +02:00
Jan Steemann f79ecd692c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:41:58 +02:00
jsteemann bf4d5acce4 added copy&move for AqlValueMaterializer 2016-05-04 16:39:32 +02:00
Michael Hackstein ca836216fc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 16:38:16 +02:00
Michael Hackstein a7211619c9 Fixed a bug with AQLvalueMetarializer running out of scope to early in some functions. 2016-05-04 16:35:34 +02:00
Frank Celler 5f0ae035b0 added default env variables 2016-05-04 16:25:18 +02:00
jsteemann bb4b1b8b88 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:20:28 +02:00
jsteemann f2d014ff6a bugfixes 2016-05-04 16:10:04 +02:00
Michael Hackstein 04753a9131 Improved type checking of options in a graph function. 2016-05-04 15:54:16 +02:00
Jan Steemann c2b1db5f96 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 15:43:43 +02:00
Michael Hackstein dc2b4655bd Checks if documents are in list now uses CustomTypeHandler. 2016-05-04 15:43:01 +02:00
Michael Hackstein dc49aed09c The Equal function used in Sets and Maps now can optionally be instantiated with Velocypack options. This is required if we want to put complete documents into the container. 2016-05-04 15:40:37 +02:00
Wilfried Goesgens a9e6665b8a Adjust config db dir in test for the new way of having it named arangodb3 2016-05-04 15:28:49 +02:00
Wilfried Goesgens b163692df7 fix python detection. This line got lost. 2016-05-04 15:20:56 +02:00
jsteemann c7effa2410 readded subdirectory 2016-05-04 15:05:54 +02:00
jsteemann 2a2ad584a5 updated gitignore 2016-05-04 15:01:40 +02:00
jsteemann 7ad08738af Merge branch 'devel' of https://github.com/arangodb/arangodb into dox-cox-pix-ex-rox-box 2016-05-04 14:54:45 +02:00
Alan Plum b11af7f6a4
Make scss-lint happy
I guess? Maybe? This is what you want, isn't it?
2016-05-04 13:57:02 +02:00
Frank Celler 61844b62f0 added --no-book 2016-05-04 13:55:54 +02:00
Frank Celler 3129b5a14f removed cap 2016-05-04 13:55:45 +02:00
Frank Celler d5fd6ac0e7 fixed order of pthread, fixed cmake 2.8 2016-05-04 13:51:16 +02:00
Frank Celler c0c23973f1 fixed config path (now /etc/arangodb3) 2016-05-04 13:51:16 +02:00