Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod/RestHandler
History
jsteemann de9dc289c0 Squashed commit of the following: 
commit f14e88b6259212b33843653292d95a607ff894a3
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Oct 23 11:03:30 2016 +0200

    clang does not like reinterpret_cast

commit 96920079514965e792bf9688cb51cdad944692f4
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 13:52:47 2016 +0000

    honor minimal

commit a460c3df878b9e8b544812f0fda471c1fe519458
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 12:23:16 2016 +0000

    added hidden options server.maximal-threads and server.minimal-threads

commit 38713a0a614550b38f4eb650ff62300732f90298
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:17 2016 +0200

    fix test

commit 532d65e0d22fc6916b36d6fda23ab95cd34c1ac2
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:03 2016 +0200

    re-added methods needed by EE

commit b7624580e7809baa0cdf9145e2102952e872346b
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:11:50 2016 +0200

    cppcheck

commit da5e02351ec7872302840ca14f67aeda8ab3150b
Merge: e216800 d19beb6
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:51 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e2168009bde63971d5c7a17653c26a6f9ae23c3c
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:30 2016 +0200

    fix non-deterministic inserts into edge index

commit 6b131ee1143f17f5465a8423921b7a96c382013e
Merge: 8ebf7f0 285ddb8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:53 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8ebf7f043efcda7fd31e1e78c6a0da99cc461b89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:36 2016 +0200

    micro optimizations

commit ad32930b9e50ea52cb9821508912ddd80564193f
Merge: b40cfb4 fdb2104
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 09:10:31 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b40cfb44dd4861471385d30f3777b17ba2995ef1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 16:07:40 2016 +0200

    share some context

commit 2411e59f2bcbd96889aac36e0a38ad62dca1ea65
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:48:05 2016 +0200

    remove unused functions

commit c422037e97572605cce4895c5cdb4b8ffa30f287
Merge: 9e9a2f7 88ea314
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:31:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9e9a2f7c9428f333fa3c7674bb82853574ea2f2c
Merge: cedced5 638ce07
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:27 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cedced52c3dfcefdc8d5ca57924064b350e338e8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:14 2016 +0200

    experimental improvements

commit 455cb59bc641d8137d635d1ff6a137183c455b00
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:25:36 2016 +0200

    pass argument by reference

commit b922a14d984dc82d55d54297552778342b6cea64
Merge: 8afd5d3 0883c49
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8afd5d35d562de4596af5b5acf1909f3c232ed60
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:47 2016 +0200

    micro optimizations for shortest path

commit e92edcc7f5dcb1429052d337eeb10b087f5dfac0
Merge: eb2d774 084961a
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:50:42 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit eb2d7747d81bc0105579ad2e6f19a4743bd217a8
Merge: 146d3e3 b376769
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:30:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 146d3e3b90304897459ecde3b9d9b282042a412f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:29:41 2016 +0200

    mini optimizations for traversal

commit a8cfa933c8f96840a4dca355a1efee2086a5cf2d
Merge: b990d0f c3de3ca
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:35 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b990d0f6914d4c483f9e521d0132937eb0aa5bc4
Merge: deea0b0 090a591
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:31 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit 090a59103feac32b848f18fafdb4f97816bf92f6
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit deea0b00b1ac35b4b23756218d2c12ab72185b09
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:40 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d8537ef56e537356e32b82e10cd2b9833c542bb8
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 17:16:42 2016 +0200

    potential performance improvements

commit 828ac8743ce67a964bd2d622689cf3c69b7aa22e
Merge: e696a95 76ec1fd
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:38:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e696a95b50db1a8819247ef855b0dad710b4cc62
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:37:07 2016 +0200

    dont pass nullptrs

commit 5b31ff978091fa1ae80d59b6ba7bad63f0c83ef7
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:36:45 2016 +0200

    fixed shutdown order

commit 8698892b6e9395151dcfdca778ad9177b19b1614
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:25:21 2016 +0200

    added assertions

commit 8bcc2d4610ae0c15f6406b82568e3a15a8f6df5a
Merge: 1f0676b 92b5887
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:16:24 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1f0676b9e95dc47a2c573380c6d165f875fe6e87
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:15:06 2016 +0200

    potential performance fixes

commit 3eeee4a904079d33d6fd695100afc080acde1dc7
Merge: c111396 14d8d35
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 11:39:22 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c1113968db5fd9e4cefa8be0150dafc37cf1e25f
Merge: 4db8b2c cd3a5b4
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 09:08:28 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 4db8b2cbb75218391b6499de7a35bca480546031
Merge: 241e0ab e181457
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 241e0abbee7d040eeadfa2d0fd195f21a4eac0d4
Merge: ed309a9 93c5672
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:05 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit ed309a9abaf3185af7e4ed75278eb78716e18935
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:25:32 2016 +0200

    fix compile error

commit a53793c63988ac4e4ba8a074f61e8130c01aea04
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:13:32 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 93c567295186197236fd8d4a2f25109167e57c6c
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:07:10 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ddfc6ebbd475a238cfe23ed9b9860ea8ed840355
Merge: 762d01e 0d1572c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:57 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 762d01ed7c58c2981c8f7ff8f0736e47d34006df
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:45 2016 +0200

    hold mutex for shorter period

commit 74f5e8a402ec7f94606053acf3361225d7140bee
Merge: ece92b5 6bc276e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:36 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ece92b50a7f87685e7b3e9b2503ec224573b7663
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:17 2016 +0200

    performance optimizations

commit 979b5e29a3f707104fe70e632fc2f701fc8b731b
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:29:56 2016 +0200

    don't use pointers

commit 3f30c6d849d586c01020bb093d094dce91f14d13
Merge: ab3af79 0baecf1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:16:36 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ab3af79ca3f608df621bc98966e8d93bd848d401
Merge: 818f576 3c96c6f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:14:37 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 818f576580683704147f113208f2376de8eed9da
Merge: 19e1488 1c1a659
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 09:24:15 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 19e1488220cecfb0588f9b49b9f6cc26ea6fa93f
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:55:25 2016 +0200

    use half of RAM for target size

commit aef5156b7d131b47d7deacf30f20ad1dde79b843
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:28 2016 +0200

    revert boost changes

commit 294517d36f2c35757593b705ac2a5e56f3d9b9dc
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:20 2016 +0200

    fix compile error

commit 80b7560a041fd80e5b0199b5ae1cbe0a96d118a5
Merge: b220f79 f748bab
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b220f795b686a1b7a8c7f1eb50b32eee5ff573ae
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:16 2016 +0200

    stability fixes

commit 4751c25ef42cbc2f688dbe9761453e6a1209d959
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:42 2016 +0200

    silence boost compile warnings spam

commit f7f7cbeedc8881feb4eec45591f70b24a3d9292b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:29 2016 +0200

    fix compile warnings

commit d1e3f35e55963666d85c5084cb01dc8330866249
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:14 2016 +0200

    change warning to fatal error

commit e858e5f6bbfd1ad5a32eea66fe7881d795527af4
Merge: cbe8299 0586862
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:58:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cbe8299d8b127588533d8a292e46d77f889a8845
Merge: 4859562 df391b2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:24 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 48595629fe43531d9fbbd5b982cb3c78b18b17f2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:03 2016 +0200

    move most-accessed property to the front of the struct

commit 660e3e3b94bc0b2ef5783097886939c67c6b1d27
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:29:52 2016 +0200

    don't create too many lookup contexts

commit 6c8a93b9ed4157511b04262bc429ae4df3531575
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:21:21 2016 +0200

    no copying of results in HashIndex

commit b91c040b70afc02b1e7a22a9b6e223bbac254f55
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:57:48 2016 +0200

    privatize methods

commit 70d8d6e50545b097e9e5c7dfdd0cc210af8ce3b8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:43:07 2016 +0200

    don't spam on shutdown

commit c3d37194513f4576a41cc41408af4bac7a5084ca
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:42:58 2016 +0200

    share IndexLookupContext

commit ed8362422d3bb8d8462820581ea029209fb80387
Merge: e674f2b 73f87e8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e674f2bd5f419243461c5b34fa507277fabdffb3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:22 2016 +0200

    transition static array chunks cache into an unordered set

commit ceb1dc126efa28a2cfca2f73037b6a3df57d99b2
Merge: 254e167 0a82f16
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 13:31:20 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 254e167f5195cd316dda8a79bd3103848bd09ba8
Merge: ce5ea17 f1c3c89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ce5ea175f0dec9634577d9f8bf691aea8985b9d4
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:32 2016 +0200

    remove locks in case they are unnecessary

commit 0277c938871cee66e9ef1486efe8ab0d3be24885
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:11 2016 +0200

    fixed bad optimization

commit 2db9e3534e4b9f7cb54c7b8ce52913334535b876
Merge: e408593 8c7034e
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:57 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e40859312d25a42ee41640341ece78255ab5d0df
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:41 2016 +0200

    performance optimizations

commit 6c9f19b06fc428581bee193cd7a3b9ce5a7219bb
Merge: baf397b df977e6
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 11:16:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit baf397befd61cbb072c0cebc27bf72726f22d21a
Merge: 2c43c62 d229ac3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:40 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2c43c6242ea606428789b2e33295610e1b2d15f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:24 2016 +0200

    performance optimizations

commit 6304f67551dbdfc82579e37d5b02f1c73bdfe4e4
Merge: 8504836 bf8da24
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:34 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8504836efa2da621cb15e028dfae2f7608d37383
Merge: c4e27d0 48d29c9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:28 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit c4e27d0ad85fcef3b5456bf9a2e43d717fa634e9
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 48d29c9abe585801c1df96fcbac73498d5f41fa7
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 95aad698140f38e07d19b693075b008fbb0c5681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:42 2016 +0200

    use relative include path

commit 7e410c86cf6e5f5e2431801728f9683daa70a8c0
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:26 2016 +0200

    simpler iteration over all documents in a collection

commit 49eec355dfbc4a5812245adc7199de0ae74a35c3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:11:45 2016 +0200

    micro optimizations

commit f7e2d008f32d9526a525ddb15ac696b2af6eacae
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:10:16 2016 +0200

    move seldomly-used code into own function

commit 7fb500e0bf97fa9b1be497cbae4c0022bb101615
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:09:56 2016 +0200

    micro optimizations

commit debf61f9563f00a34028e31ea91fdd8274b5c401
Merge: 1a1024d 053e7fc
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 12:15:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1a1024d38563f4cb08c68be0d5a891fcb2414954
Merge: 89414ef 001407d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 08:47:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 89414efadcfc3db01e43d2baa5ef6d12f627aa17
Merge: 221ae0d 0bfe447
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 17:12:03 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 221ae0d34e6d6316dd7079c3c025a5b890a7a273
Merge: ee038eb e75b8f5
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:46:09 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ee038eb2115b021de5f5301edb8c4e4337e3faad
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:45:49 2016 +0200

    index refactoring

commit 20739bdffca0104bceb603073f7a50023febbdf1
Merge: 9c356e4 5d65b0b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 09:11:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9c356e462ebcf05dd37ba424d2d9b1d007d3164c
Merge: e50a934 8aa34ec
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e50a934b151e7a92d916ce8ffb0ca167bfb02e10
Merge: 00e1fff 51dd5a9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:08 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 00e1fff3b0e7bff7afd74023aa24b2abd061fe42
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 15:15:34 2016 +0200

    changed primary index to not use pointers

commit 0318f177e13a2c9d5e3f8473d8b63de505f5d80b
Merge: 6230439 3fc8677
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6230439538c73bd3e2bf553bea6a53f91db1db28
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:05 2016 +0200

    remove _extraMemory

commit bf5b4f957751fa0fc6702da62ce46a008613a99d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:27:52 2016 +0200

    index API preparation

commit 5a2d19daa5f0c95131733eb94ea9182fa5b8f822
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:15 2016 +0200

    fix API

commit 4835ba6ca3ed071e477bf69cec4eec1b9b46b12a
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:08 2016 +0200

    removed garbage

commit a8f29ad166d50cb85bf0f95a0594d8a8baf3043b
Merge: d559c31 f790795
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:02:29 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d559c316922e06c3cf5da6654afe9aeae15a8d5f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:13:58 2016 +0200

    cppcheck

commit 89f525278e87d0ae926367f5c2fdb08faba4932f
Merge: 6ba81c2 21beb09
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:05:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6ba81c27e6cfa425c2a59569a371707abd2aa8f3
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:04:59 2016 +0200

    enable disabling _rev checks for pre-release 3.1 data

commit 21b701c1792d8eeaa0321ce494fafe9102c1ba9a
Merge: 1bddd76 11a9d3b
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1bddd7645fb3761eb2946b21f08f5189dadadf11
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:00 2016 +0200

    free unused cache memory more eagerly

commit 0136e2f0514c9fc2b35a5d21b72a3ebb64c0aaaf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:23:52 2016 +0200

    renamed variable

commit 9c276a069a24f5d4544b7147efe57679c039eebf
Merge: 7c70abb 93cb87e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7c70abb2ce45858aaa77e08785bf635e699428f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:34 2016 +0200

    platform-specific target size for revisions cache

commit 817561b1c220a4bf82b5a554efd1b70980eaa406
Merge: cb4b9e7 750b562
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:30:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cb4b9e75ffac7f33041562c57e2a062ffc8f7aa0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:58:53 2016 +0200

    fixed crash

commit c5dbd81bd6405bb4247d57fa6afdf39f48f0922c
Merge: 8dad7b3 ca102fc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:55:07 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8dad7b3de027a29acab9c97ec00a21baf8fb36d9
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:54:51 2016 +0200

    fix garbage collection

commit 8cac202eb8f2d05a42fc64922096e7e814de23a3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:32:55 2016 +0200

    API cleanup

commit 728429981af90b9a0207646acd9b4e32fa78f7d3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:22:47 2016 +0200

    make option hidden

commit c3fd3621d4f929c860a19ee99b523c71e5510b48
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:20:53 2016 +0200

    remove OtherEngine

commit dd069158ed9be8aca4d9221d38e16771f424081e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:18:40 2016 +0200

    preparation for results aggregation

commit 983980afd2bdbc3602676b305dea3f816b12bd78
Merge: c46fd98 8a5bc21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:16 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c46fd98516ba5674e0a3abad544c2b5cae7e340e
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:02 2016 +0200

    use own hash tables

commit 1e11621149dfd8d98cc78adcae9181778454abf1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:15:37 2016 +0200

    fix another crash

commit 0bd000c880afa78d45b215adff7dcf055ee9eb8e
Merge: 7e5da3d 69e453a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:54 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7e5da3d08667823af80d75e0eaf7af41d8cebd4a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:40 2016 +0200

    fix crash

commit d2c9ae228de019380091fdccafb50960d1ae17ac
Merge: a2571d5 2d4bcaf
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:47:49 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit a2571d581cd3e52941846c4ce8f488b9220af0ea
Merge: d02b002 1f0ecf9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:53 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d02b0026fa8cbcec0539985ba9f5fc5ca2eb1592
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:31 2016 +0200

    garbage collection

commit 04794a8b5cfea93f9d0e620119941753052609de
Merge: c38c2b7 454e0bf
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:38:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c38c2b74955b33046ecb1d459a98c76b7f908aa4
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:37:55 2016 +0200

    fix shutdown

commit 3d0f7d3daedd9332222648f8e096dd84d9eba142
Merge: 2bbe5a0 54a0d45
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:38:05 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2bbe5a02aa2d9010056ec09bb526024fce9ed108
Merge: 8442ea6 0ea2ca2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:35:29 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8442ea63e5bc84705b844066e11dd4c334b0d796
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 15:00:35 2016 +0200

    read caching

commit 0cb85c8d9fb7092ad5365de69cc51b989ab84449
Merge: 5baa73d 44edc6c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:52:39 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 5baa73d63eb9dd4a6b5168da636bd8b89958883a
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:43:39 2016 +0200

    preparation for read cache

commit 55445bfb85374fd1b88ebfc29151ac60e10d1d81
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 08:50:42 2016 +0200

    refactoring

commit f1cf513a8c1359a9e4e8f18b8a6af0c5440bc091
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 16:19:58 2016 +0200

    refactoring

commit 2ab07bb6efda66b22cff2b02b64e7d17157ea56f
Merge: aa8327c 1bdf414
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:51:11 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit aa8327c151b7ae06046ad5ce95aed3d3e5c45a10
Merge: c55fd03 35e14fd
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:14:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c55fd031c612aee1479e361d51d92212a4e74d19
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:36 2016 +0200

    fix replication

commit 51164b4e70f6a6a16f841f369ecde1e906abb102
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:30 2016 +0200

    refactoring

commit 548c7f60dd14d834f796f7dde6d90feb9ba1be8e
Merge: 6be89c3 9b951ff
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:21:22 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6be89c3013e5fb1eddf83befcdaf5d5ff935e9f1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:20:52 2016 +0200

    allow storing arbitrary data elements in AssocUnique/AssocMulti

commit 73e5b06a050db6c3994abeba14675fe93e0c5b3b
Merge: ab5bb48 d9d0926
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 10:22:01 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ab5bb486bcb2e4eb8fb7267a68a7939c85e64f5b
Merge: 345963c a94db7d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 20:50:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 345963cb6931fc7ce1f2714735f4bfbc60ca50e1
Merge: db3a071 d6a3b81
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:42:20 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit db3a07134341156c1489399e33368858059094df
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:30:52 2016 +0200

    removed last occurrences of master pointers

commit 29222e71415120a9c7163cbc420414b93acad988
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:14:20 2016 +0200

    pass Transaction in API so we can make sure a transaction is ongoing

commit 78ba63060d1675eec6d35abe056d22c2cb6b91fb
Merge: 906dc42 560da96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 906dc428ddf8ef079f7fa3664cb89df3fbf07c21
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:23 2016 +0200

    pass initialCount to physical

commit 46971f72b09dd2dbbd8e20fad7be138298ec0180
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:39:05 2016 +0200

    privatization

commit 7ec3508bb0be4b56de9fec42e1417000efe20ad7
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:37:17 2016 +0200

    move master pointer management into engine

commit 667fbef8ce5ec426e3a16a5ef377ff0e42b42444
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:18:50 2016 +0200

    index cleanup

commit 8fc5c764044438f2fc854f48c517a811e31f2df1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 22:45:32 2016 +0200

    constexpressified basic VPackSlices

commit ae8bc45a3fb34cf8f9a39548e22039d505619038
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:51:55 2016 +0200

    renaming

commit ba1b68c468e20a3d5282a937efd8a2e063c1abac
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:38:05 2016 +0200

    move last master pointers into engine

commit 179741cd1711954f91d8ec53fad7221977c4bfc3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 20:50:41 2016 +0200

    remove includes

commit ea4e5ac9d0c0479ccc34e91f7fdc08e605005681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 18:06:54 2016 +0200

    removed TRI_doc_mptr_t

commit 40c7ce768898f0e4f09b133dedc335a65d1b0a21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:44 2016 +0200

    removed more TRI_doc_mptr_t

commit 3450bcc042d4caf8499af3c5454e37b1eeaf8a28
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:23 2016 +0200

    removed more TRI_doc_mptr_t

commit 64e17c8744330d2835c39523c7b15f9b79c429ef
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 13:56:08 2016 +0200

    cleanup

commit 38feed51f15bdefa95e18dab0b694eccfe1d6a3b
Merge: dbbdeb4 ec15c72
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:03:08 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit dbbdeb44f17f804fa798e2ee4d677543fec1b05b
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:02:45 2016 +0200

    make geo and fulltext index more robust given different platforms

commit c4e90fcf6a44390ecacacd6dbca3e5cf43179484
Merge: 86603e0 049471d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:56 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 86603e04710170108d8ef4c023fa68f9366e628e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:37 2016 +0200

    removed unused struct

commit 86b1b2568aefaba5ab7f621cb27b0ae5841b4da5
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:22:12 2016 +0200

    less TRI_doc_mptr_t

commit 30c3077002f23970e689ac422371b4e8054797db
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 16:49:09 2016 +0200

    less TRI_doc_mptr_t

commit ddb8ea6e958464f12a20a5d9e29772074dab22db
Merge: 14b9b5e d4d5e15
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:50:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 14b9b5e22030c98459b5b547cb0417a0be7970a2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:49:44 2016 +0200

    remove mptr from method

commit cc0ed4046fcef91571f0b9b612fb290d2c19791f
Merge: 8b2b849 6fa99b6
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:27:30 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8b2b849e8c256559fc579da74863b2005356481c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:26:57 2016 +0200

    create separate mptrs on update/replace, and dont mess up the existing ones

commit 88b885e2aa36b33feb3983a4c822c593fcfbf165
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 13:11:38 2016 +0200

    cleanup

commit 851e62ef0697c60590da7f26524dd824192e6a78
Merge: 05f2fcf f510773
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 05f2fcf5ea52baf45aa8fff4624d9fe08fd9b4c7
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:11 2016 +0200

    a bit more cleanup

commit 4928db648984811c58cb3e33be672f9c46c79320
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 10:42:49 2016 +0200

    remove occurrences of TRI_doc_mptr_t

commit 8c1f0cbec38a4c62c1d481d291a7b913273f5271
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 09:13:17 2016 +0200

    partly move master pointers into engine

commit f80bf0c097f9439a8f3b3db8bac27d63086f4de9
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:43:26 2016 +0200

    refactoring

commit 407ddd508aa6016e99bf311df13c8aa0f8ae94c3
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:34:46 2016 +0200

    refactoring

commit a40c87ead0b6ad3cdccdc826ad178b25f5ea466e
Merge: df3ceea e245e15
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 09:11:48 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit df3ceea699ab4f41501bb79eb206fa54bd502383
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 11:21:48 2016 +0200

    cleanup

commit e5ff73bf80c064a4c92372ea80c3a2351973df1c
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:37:17 2016 +0200

    cleanup

commit 44f42b25f09a2110b60d042635f8213242483f8f
Merge: 2bf7e33 fad7efe
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:00:38 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2bf7e3373b0ad7e2a2fed7ccf883be05a51e4a22
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 17:21:51 2016 +0200

    unify index iterators a bit

commit e83455dece1bd014a126e9a5554f9a7c1fe4de3f
Merge: c83eab8 c912d96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 14:07:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c83eab87106ca6f5123a4a4747a730deb71069eb
Merge: fb4c5c3 b9b7d8d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:59:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit fb4c5c3108af5ae8bd5bdd70748687e24b983b37
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:58:58 2016 +0200

    bugfixes

commit 7643365abca94aca5d138bd46341d086c1f0fb14
Merge: dabddf7 7e866a8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:37:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit dabddf728932cc00abc6052370cab9d081eb1025
Merge: 1662199 abb16ee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:34:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1662199d843256c0002c59c85b5f013306098cee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:17:25 2016 +0200

    cleanup

commit 3ce9cf9de45f324af07112b2ac0c79ef22805cb1
Merge: e5d9703 135edf1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 09:29:38 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e5d970356041123b92a6ee20e4e800175e04f548
Merge: cd2def8 542f4bb
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:44:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cd2def8762859d1cafbe066936a22a5ef27ae508
Merge: 9baaf4b a9cb076
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:43 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9baaf4b32d6356d3defdfd8a4b1c0cf3f7ebfacf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:24 2016 +0200

    intermediate commit. not working yet

commit 0ec0a7ce2598f4fb7a55880611947e12112e14b3
Merge: 66c6bbe 1a2a3ba
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 14 09:43:27 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 66c6bbe68fd20cfd9c2b8c00b2220294f29124ef
Merge: f5aadb1 b5ccbd1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit f5aadb1b82a85334b3a26b6fd6b9f00bebfa65f1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:08 2016 +0200

    some index refactoring

commit 23e5db5bdb2a192cb4e7fe9b4572fb1e272c4a11
Merge: 25355ed 84fbc98
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:30 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 25355edc43111717de0d80101e56f44c99d84a56
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:19 2016 +0200

    removed dead code

commit 9dd274a1c1694c53987dc6d77526711b46ba996c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 09:20:34 2016 +0200

    some refactoring

commit 049c11769dd38b7afac9cb85ef03ce617f96140f
Merge: ee75b21 a620690
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 08:43:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ee75b2169b533bafaac49752ca3b11b43940b928
Merge: 4f3a3ac 9539f2f
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:07:05 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 4f3a3ace83b301aa5e86e4b85b1b03f02f3dd0ea
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:06:46 2016 +0200

    refactoring

commit 190520d23d89c5435e4b5fce4ed7dd6dbdcc9d6c
Merge: eacd578 61c6e3b
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:34:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit eacd578f1d837a622a69fdf1b7d0ca03fbe7d5bb
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:33:47 2016 +0200

    refactoring

commit 7dbac24e00e39943130cfcc3e8a9923fda15c663
Merge: 7a62bb8 2761b7d
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:20:49 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7a62bb830749a661c189d96d6931ba3993bc00ee
Merge: 8d40248 4cebbf9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:09:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8d40248badbf0f11abbd67a21dc356bb6c5d7ee2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 14:45:39 2016 +0200

    renaming

commit bedbe0f5105ba682552ad8192a6753ed68fe899d
Merge: c1321a3 1fcc5b1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:57:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c1321a37e06fbf56e66456fb8341cce46bd2ae37
Merge: 13c14b9 884b6d5
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:53:51 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 13c14b96ac95331171013ca2283cb5c6923d7489
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 10:29:27 2016 +0200

    renamed

commit 60b8189cf9b045493fb863bc5988e55f865a6280
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:42:03 2016 +0200

    use algorithm::transform

commit 9019c3247db8b75340721d949754a90da648d511
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:41:37 2016 +0200

    get rid of free()

commit 2c6ab07b469d86297131d420c1a14a95771017b8
Merge: c49664d 331c4e3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:30:21 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c49664d95b308c4b59b9ff07fe1f1d68f9742778
Merge: b42aaeb 01e445a
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:22:56 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b42aaeb3dfda6fce26eab0de47b617601a7cbfb6
Merge: 964fa6a 64da7d0
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 08:56:54 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 964fa6a2d656fed8bc89e4da445892df9d20046f
Merge: 24fd06e d7b4ad5
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:30:09 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 24fd06e5263d2b82e32f128270fc16af06839095
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:29:40 2016 +0200

    added initial cache

commit 6f092c2d8828b86627fbd80e67be8a5985bda88b
Merge: 2733228 df4dabc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 15:48:33 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2733228be753bc5425adca5963b865f7d5168a46
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 14:37:32 2016 +0200

    cleanup
 		2016-10-24 10:18:30 +02:00
..
RestAdminLogHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestAdminLogHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestAqlFunctionsHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestAqlFunctionsHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestAuthHandler.cpp Merge remote-tracking branch 'origin/devel' into authentication 2016-10-17 13:51:26 +02:00
RestAuthHandler.h Merge remote-tracking branch 'origin/devel' into authentication 2016-10-17 13:51:26 +02:00
RestBaseHandler.cpp added HTTP REST APIs for online loglevel adjustments: 2016-09-08 11:15:49 +02:00
RestBaseHandler.h added HTTP REST APIs for online loglevel adjustments: 2016-09-08 11:15:49 +02:00
RestBatchHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestBatchHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestCursorHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestCursorHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestDebugHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestDebugHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestDemoHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestDemoHandler.h fix compile warning 2016-10-17 17:16:55 +02:00
RestDocumentHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestDocumentHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestEchoHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestEchoHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestEdgesHandler.cpp Squashed commit of the following: 2016-10-24 10:18:30 +02:00
RestEdgesHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestExportHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestExportHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestHandlerCreator.h WIP 2016-05-22 21:08:37 +02:00
RestImportHandler.cpp Squashed commit of the following: 2016-10-24 10:18:30 +02:00
RestImportHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestJobHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestJobHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestPleaseUpgradeHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestPleaseUpgradeHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestQueryCacheHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestQueryCacheHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestQueryHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestQueryHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestReplicationHandler.cpp Squashed commit of the following: 2016-10-24 10:18:30 +02:00
RestReplicationHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestShutdownHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestShutdownHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestSimpleHandler.cpp Squashed commit of the following: 2016-10-24 10:18:30 +02:00
RestSimpleHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestSimpleQueryHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestSimpleQueryHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestUploadHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestUploadHandler.h fix warning 2016-10-17 13:49:28 +02:00
RestVersionHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestVersionHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
RestVocbaseBaseHandler.cpp added HTTP REST APIs for online loglevel adjustments: 2016-09-08 11:15:49 +02:00
RestVocbaseBaseHandler.h added HTTP REST APIs for online loglevel adjustments: 2016-09-08 11:15:49 +02:00
RestWalHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
RestWalHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00
WorkMonitorHandler.cpp switch to boost asio 2016-10-14 10:12:17 +00:00
WorkMonitorHandler.h switch to boost asio 2016-10-14 10:12:17 +00:00