1
0
Fork 0
Commit Graph

29516 Commits

Author SHA1 Message Date
hkernbach 748fbb29ef Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-27 01:10:54 +02:00
hkernbach 03a5bb17c2 changed aardvark job mechanism 2016-04-27 01:10:37 +02:00
jsteemann 18b4b0f86f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-27 00:45:35 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Frank Celler 3d75364af6 changed to boost 1.61 2016-04-27 00:18:34 +02:00
jsteemann 5e496ff77c fixed config parameter name 2016-04-27 00:14:37 +02:00
jsteemann fbd254bf22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 23:30:47 +02:00
jsteemann 0d01f5d5f0 better diagnose cyclic feature dependencies 2016-04-26 23:30:30 +02:00
jsteemann a596445e1b fixed feature order 2016-04-26 23:23:34 +02:00
jsteemann 1832670e8f global exception catch block 2016-04-26 23:23:06 +02:00
Frank Celler 33c96bea86 added application/x-velocypack 2016-04-26 23:01:36 +02:00
jsteemann 9203013ef3 simplify and fix logic 2016-04-26 21:31:35 +02:00
Frank Celler 59b93fa121 fixed shutdown 2016-04-26 20:46:03 +02:00
Frank Celler 3afb306faa removed uneccessary file 2016-04-26 20:37:46 +02:00
Jan Steemann e2b296ddee disallow connecting from ArangoShell 3.0 to a 2.8 arangod 2016-04-26 17:57:58 +02:00
Jan Steemann 784ff23f36 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 17:45:29 +02:00
Jan Steemann 866f858acc try to fix some startup confusion 2016-04-26 17:45:18 +02:00
hkernbach 3c49e87796 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 17:38:52 +02:00
hkernbach ba2466268f scss lint 2016-04-26 17:38:40 +02:00
Andreas Streichardt b9c85c5688 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 17:33:17 +02:00
Andreas Streichardt 6719de1192 Fix agency redirect 2016-04-26 17:32:51 +02:00
Jan Steemann 02749017ac updated documentation 2016-04-26 17:24:22 +02:00
Jan Steemann 82e0077de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 15:53:23 +02:00
Jan Steemann e48ed1c630 updated documentation 2016-04-26 15:53:14 +02:00
hkernbach e4be342eb0 backbone collection: removed fullCount options 2016-04-26 15:18:35 +02:00
Jan Steemann 174a3b17f4 fixed test 2016-04-26 15:04:21 +02:00
hkernbach 662f1fe5a2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 15:00:19 +02:00
hkernbach c80b44c994 grunt build 2016-04-26 15:00:11 +02:00
Michael Hackstein c1191d4268 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 14:50:28 +02:00
Michael Hackstein c3958a1215 AQL REMOVE Block now makes use of baby variant. 2016-04-26 14:50:21 +02:00
hkernbach 892461dbd3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 14:35:54 +02:00
hkernbach 776dea96da views, scss, templates, router 2016-04-26 14:35:39 +02:00
Jan Steemann c9b966767f documentation 2016-04-26 13:25:44 +02:00
Jan Steemann e65722ff35 documentation for changed startup options 2016-04-26 13:21:25 +02:00
Jan Steemann 80dbd20108 fix connection statistics 2016-04-26 12:20:01 +02:00
jsteemann 57f43f1a22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 11:58:19 +02:00
jsteemann d21cdb50ad speed up transactions 2016-04-26 11:58:10 +02:00
Michael Hackstein bd302a023c Reduced the nesting level of arrays in AQL test. Icannot be executed on MacOs and asan 2016-04-26 11:50:19 +02:00
Michael Hackstein b25a35f6fe Removed unnecessary forwards and imports of JSON and doc_mptr in ModificationBlocks. 2016-04-26 11:17:18 +02:00
Andreas Streichardt 609cebb48f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 09:06:30 +00:00
Michael Hackstein ad78242ff0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 10:50:41 +02:00
Michael Hackstein 4d440220a5 Used a shared builder for a closure instead of creating a new one every time. 2016-04-26 10:50:30 +02:00
Jan Steemann 69c7fbe146 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 10:48:48 +02:00
Jan Steemann a0883fb0fc fixed busy wait 2016-04-26 10:48:42 +02:00
jsteemann 5fb9d758c9 micro optimizations 2016-04-26 10:38:47 +02:00
jsteemann 021183f14e added tests 2016-04-26 10:23:47 +02:00
Jan Steemann b57481365d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 10:22:23 +02:00
Jan Steemann 64350d802d micro optimizations 2016-04-26 10:22:13 +02:00
Andreas Streichardt 5bc646ff44 Put required debian options into a script 2016-04-26 08:09:33 +00:00
Kaveh Vahedipour 181098fe4e solaris ridiculous and random errors 2016-04-26 10:01:36 +02:00