1
0
Fork 0
Commit Graph

13404 Commits

Author SHA1 Message Date
jsteemann dec7e084e5 added diagnostic output 2017-01-11 08:25:17 +01:00
Max Neunhoeffer 062ec7ec1a Activate ng Schmutz for databases. 2017-01-10 23:36:46 +01:00
hkernbach 04db0bb98e grunt build 2017-01-10 18:50:21 +01:00
Kaveh Vahedipour bf1199d6c2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 17:30:21 +01:00
Kaveh Vahedipour f34796b432 move resilience should now be correct as a test 2017-01-10 17:30:09 +01:00
hkernbach 4ae274fbd3 fixed cluster parsing issue when node information is not available 2017-01-10 17:07:51 +01:00
Max Neunhoeffer e9630b7aca First set of changes, not yet activated. 2017-01-10 16:54:51 +01:00
Simon Grätzer 9c9d0a6a20 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 16:30:32 +01:00
Michael Hackstein 1f428ae947 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 16:04:40 +01:00
hkernbach 0fba37087f typo 2017-01-10 16:00:16 +01:00
Michael Hackstein 0365363090 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 15:39:12 +01:00
Kaveh Vahedipour edac0586ab move shard has always been a matter of luck as a test in the cleanoutserver part 2017-01-10 15:37:08 +01:00
Michael Hackstein fe7a829592 trx crud with empty arrays now short-circuit and return success with empty array. This lead to errors in cluster, band now is consistent with single-server. 2017-01-10 15:15:15 +01:00
Max Neunhoeffer f47329f3c0 Mock new structure. 2017-01-10 13:41:16 +01:00
Simon Grätzer 01ac5a51a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 21:12:24 +01:00
Andreas Streichardt 95cc704741 Ahhh jslint 2017-01-09 17:42:13 +01:00
Andreas Streichardt b51aebd596 additional error checking 2017-01-09 17:37:06 +01:00
Kaveh Vahedipour 0875353a26 all ArangoAgency.set rewritten in cluster.js 2017-01-09 17:30:36 +01:00
jsteemann 75263042c8 added tests for dropping indexes 2017-01-09 15:56:36 +01:00
Kaveh Vahedipour 3b57e84865 missing semis 2017-01-09 14:56:53 +01:00
Kaveh Vahedipour 41ca7d17e4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 14:45:57 +01:00
Kaveh Vahedipour 13076e9fc1 no locks left in cluster.js 2017-01-09 14:45:44 +01:00
hkernbach 823c20bd84 issue: #2181 2017-01-09 14:23:46 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
2017-01-09 13:34:37 +01:00
Kaveh Vahedipour 1ff26054fa jslint needs satisfaction 2017-01-09 11:46:26 +01:00
Kaveh Vahedipour 49631284c7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 11:11:39 +01:00
Kaveh Vahedipour 853eb1849a oops 2017-01-09 11:11:28 +01:00
jsteemann f69985014b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 10:59:15 +01:00
jsteemann 503326852c try to fix test for MacOS 2017-01-09 10:58:58 +01:00
Wilfried Goesgens 6830fd57f8 remove comments 2017-01-09 10:57:42 +01:00
Kaveh Vahedipour 55985ed5de missing prototypes 2017-01-09 10:38:34 +01:00
Wilfried Goesgens 8f13b943f4 re-enable testcase for windows. 2017-01-09 10:11:01 +01:00
Andreas Streichardt 13e3e8e673 more agency request mockery 2017-01-06 17:57:11 +01:00
Andreas Streichardt 11eb78c056 jslint 2017-01-06 17:28:39 +01:00
Andreas Streichardt b447051677 remove console.logs 2017-01-06 17:24:39 +01:00
Andreas Streichardt 466f932701 First steps to low level replication debugging 2017-01-06 17:19:07 +01:00
jsteemann ef76ab38cc fixed test 2017-01-06 15:29:01 +01:00
Kaveh Vahedipour c533f311cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-06 14:47:02 +01:00
Kaveh Vahedipour a0af781630 to lock or not to lock 2017-01-06 14:46:57 +01:00
Frank Celler 9290d89412 removed superfluous dashes 2017-01-06 14:15:45 +01:00
Kaveh Vahedipour fbce62b558 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-06 09:38:43 +01:00
Kaveh Vahedipour e87182d971 more verbose output on failure to create plan 2017-01-06 09:38:37 +01:00
Andreas Streichardt 975e7a65b2 Fix cluster internal requests in authentication enabled cluster 2017-01-05 16:20:15 +01:00
Kaveh Vahedipour b0a5b31626 shortening moveShard 2017-01-05 15:31:23 +01:00
Kaveh Vahedipour ea4467e0d4 shortening resilienceFail 2017-01-05 12:21:27 +01:00
Wilfried Goesgens 19b8c90bcb fix examples - reset collections cache when working with the graph api
- add dummy cache flush function into the arangod db object
 - call cache flush when creating and deleting graphs
2017-01-04 14:34:26 +01:00
jsteemann 49ef83c608 attempt to fix hanging tests 2017-01-03 15:54:36 +01:00
jsteemann b8a64ccca2 attempt to fix hanging tests 2017-01-03 15:53:52 +01:00
jsteemann 118a4a7778 more cache invalidation 2017-01-03 14:58:13 +01:00
jsteemann dff5c448e4 fixed jslint 2017-01-03 14:58:07 +01:00
Kaveh Vahedipour 9d5a5537ce remove deceased agents from AgencyComm 2017-01-02 17:12:00 +01:00
Kaveh Vahedipour a2ee40d4f3 restarting agents inform rest of their new endpoints 2017-01-02 15:58:38 +01:00
Kaveh Vahedipour 1e8f44dcd0 increase plan too? 2016-12-30 14:03:37 +01:00
Kaveh Vahedipour 55ffd4c55f collections and current version 2016-12-30 13:54:55 +01:00
Kaveh Vahedipour ccca0103c2 lock/write lock tests in shell_server not needed anymore 2016-12-30 11:59:43 +01:00
Kaveh Vahedipour 084c3e2e73 more robust agency test 2016-12-30 11:33:58 +01:00
Kaveh Vahedipour 4928358e04 removing trace of agency locks part 1 2016-12-30 11:21:11 +01:00
Simon Grätzer 7563fb4b80 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-29 18:09:57 +01:00
Kaveh Vahedipour 572d294ec7 getting rid of locks in cluster.js 2016-12-29 17:44:03 +01:00
Kaveh Vahedipour b712640f42 getting rid of locks in cluster.js 2016-12-29 16:39:59 +01:00
Kaveh Vahedipour 6ec19a3136 getting rid of locks in cluster.js 2016-12-29 15:18:08 +01:00
Kaveh Vahedipour ff701ff57c getting rid of locks in cluster.js 2016-12-29 15:03:09 +01:00
Simon Grätzer 9a6c7196a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-26 20:52:29 +01:00
Andreas Streichardt bceb5d7b46 disable cores during recovery setup 2016-12-22 16:40:51 +01:00
Simran Brucherseifer 9c0bf74de3 Fix link to Example Graphs section in docs 2016-12-22 15:11:36 +01:00
Simon Grätzer 344c3761ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-22 14:51:55 +01:00
Andreas Streichardt 97ac8d6be2 remove transact test 2016-12-22 13:43:17 +01:00
Simon Grätzer 52a88488d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 23:16:41 +01:00
Jana 41e74eaa8e Open link in a new tab 2016-12-21 14:45:07 +01:00
Simon Grätzer 431df0c5a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 11:56:44 +01:00
Jan Christoph Uhde c364c3c1d6 fix jslint errors in geoindex test 2016-12-20 12:07:50 +01:00
jsteemann dc922a3e82 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-20 08:50:57 +01:00
jsteemann 8e8e064429 fix jslint for crypto file 2016-12-20 08:50:44 +01:00
Alan Plum 99ba80a542
Fix off-by-one in Foxx route 2016-12-20 01:43:14 +01:00
Simon Grätzer 007134accc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 13:23:43 +01:00
Jan Christoph Uhde 5234ac3621 Squashed commit of the following:
commit 3952bf2009
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 19 11:00:52 2016 +0100

    remove debug code

commit 004da0c614
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 19 10:52:42 2016 +0100

    only do not use geoindex in inner loop if we want to sort

commit 32e1c7eac4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 19 09:16:09 2016 +0100

    manually cloning fixes the issue

commit 75823fe879
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 16 15:19:10 2016 +0100

    another try to fix the plan

commit 2a404cfabe
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Dec 14 12:21:21 2016 +0100

    add dump of ExectionPlan.

    Index Node seems to be created!

commit 0f8b496c57
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Dec 14 10:46:24 2016 +0100

    add debugging info for geoindex

commit 3d17672feb
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 17:03:01 2016 +0100

    better tests

commit 615b85e5f5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 16:09:00 2016 +0100

    add tests - sort && filter and add check for IndexNodes

commit e5fcdb7386
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 15:53:44 2016 +0100

    partial rewrite - now we start at endnodes

    and work upward towards singleton node

commit 7d93fe0bdd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 11:48:40 2016 +0100

    add link to geo-index doc to sourcefile to clarify goals

commit aac38c8a00
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 11:42:49 2016 +0100

    move collection acccesspath check to identify section

    so we can compare nodes

commit b8cc674219
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 10:59:02 2016 +0100

    prepare to fix filter-sort

commit 783a9aff89
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 16:24:52 2016 +0100

    check if nodes are really sorted

commit 1d5e28d969
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 15:36:43 2016 +0100

    fix geo-index for cluster case

commit 634eeabc0b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 13:46:20 2016 +0100

    add cluster to .gitignore

commit ae33a790fb
Merge: 1acfd65 27099a1
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 13:31:54 2016 +0100

    Merge branch 'devel' into obi-geo-index

    * devel:
      Clarify the default value of req.body
      fix VS warning
      moveShard jobs running
      cppcheck
      cppcheck

commit 1acfd65467
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 13:30:38 2016 +0100

    work on geo-index in cluster

commit 32d0bdc846
Merge: b660672 ad4ba24
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 09:15:36 2016 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into obi-geo-index

    * 'devel' of github.com:arangodb/arangodb: (132 commits)
      try to fix travis build
      Generate unique Swagger operationIds
      Add support for Swagger tags
      Add swagger route to Foxx API
      Require at least one arg in route def
      ported velocypack compatibility fix from arangodb/velocypack
      use bulk allocator for index elements
      fix memleak
      fix test in cluster
      remove unused code
      fixed resilience
      Update zwagger
      Readd satellite node
      Fix link
      Document OAuth1
      Nicer OAuth2 docs
      properly start the tarball
      fix VS compile errors
      clones method in Jobs more useful
      we don't need the dpkg-shlibdeps workaround anymore.
      ...

commit b6606727ee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Dec 8 11:13:10 2016 +0100

    fixes

commit 5416755049
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Dec 7 15:06:44 2016 +0100

    avoid use of geo-index-rule in cases where it could yield an invalid result

commit 3e24624c6e
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 15:56:22 2016 +0100

    back to performance

commit a941808ea8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 10:29:38 2016 +0100

    remove debug code for performance testing

commit 2bae135b84
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 10:12:12 2016 +0100

    add test case

commit 71be8c215a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 10:00:11 2016 +0100

    node replacement is now working

commit d1a3e4482d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 20:18:31 2016 +0100

    condition replace should be almost working

commit 275e36b603
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 19:49:10 2016 +0100

    add pointer that needs to be replaced with true

    in sort or filter condition

commit 6b93b9d2eb
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 19:38:01 2016 +0100

    bring functions in correct order

commit 5aabbb0ac0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 16:21:21 2016 +0100

    fix const-ness so the condition can be modiefied

commit c84223d598
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 15:31:50 2016 +0100

    Add information if AstNode has been found in subexpression

    this information can be used in rewriting the condition and deciding
    if a sort node can be deleted or not

commit b0b660eb85
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 15:19:06 2016 +0100

    add iterative preorder walk for and conditions

commit 5dcf61c9ba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 14:00:14 2016 +0100

    now work to a certain degree with binaray/naray-and in FILTER/SORT
    condition

commit 9b4e01eb3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 13:17:01 2016 +0100

    move geoIndexRule to a positon before inexes have been touched by
    optimizer

commit 9d04b37e58
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 12:46:23 2016 +0100

    within queries are now working

commit d858b9aa71
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 16:15:23 2016 +0100

    further implement within

commit 72d4790c68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 12:22:07 2016 +0100

    remove boost::optional and make use of nodetype

commit e0220be12d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 11:53:31 2016 +0100

    stronger split between identification of candidates and application of geo index rule

commit f27a22db06
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 11:20:09 2016 +0100

    fix debug code

commit fab9af483e
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 11:00:39 2016 +0100

    add extra log topic for development

commit 56b6be851c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 10:44:42 2016 +0100

    add functions providing capability to check ast for parts of geoindex
    rules

commit 08ef943c83
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 23:01:50 2016 +0100

    fix tests

commit 56614ac8c8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 16:30:09 2016 +0100

    switch unittests to chai and add failing test for FILTER condition

commit 8bb719c615
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 15:59:10 2016 +0100

    add first tests for geoindex

commit e619ef3e4e
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 12:21:51 2016 +0100

    now inspect sort and filter nodes

commit 5dbf5e14e3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 10:03:24 2016 +0100

    refactor geoOptimization into smaller fucntions

    this prepares the creation of the within rules

commit 2110736d36
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 16:50:02 2016 +0100

    fix logical error in nextBabies

commit 972af3af4c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 15:44:46 2016 +0100

    add within to geoindex iterator

commit 80c89d5f97
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 15:25:11 2016 +0100

    geo condition is now build with a extra parameter for within

commit 8bafcdfe92
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 14:10:16 2016 +0100

    GeoIndexIterator now takes parameters via ConditionNode

commit 86c21eb733
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Nov 29 14:13:35 2016 +0100

    make use of geo index cursor api

commit 5b3be69e10
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Nov 29 11:48:32 2016 +0100

    WIP first working version of geoindex via aql
2016-12-19 11:06:32 +01:00
Simon Grätzer f1b6170e96 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 10:17:18 +01:00
Simon Grätzer 96925c0e76 Working single phase async 2016-12-19 07:25:52 +01:00
Alan Plum e0fe78b782
Implement HOTP/TOTP 2016-12-19 02:20:53 +01:00
Alan Plum 61301a391b
Expose PKCS5_PBKDF2_HMAC to JS 2016-12-19 02:20:51 +01:00
Alan Plum 9a347f74fa
Cleanup crypto.js 2016-12-19 02:20:29 +01:00
Simon Grätzer 7afebc2223 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-17 14:10:03 +01:00
Max Neunhoeffer a7f295bfe8 Fix error handling in resilienceMove test. 2016-12-16 11:02:13 +01:00
Simon Grätzer d1a47f5b29 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-15 18:46:21 +01:00
Kaveh Vahedipour 86a0620525 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-15 17:22:12 +01:00
Kaveh Vahedipour f66d3b1dac fixed moveshard tests 2016-12-15 17:22:01 +01:00
jsteemann 3939d5e2d8 don't log irrelevant message in generated Foxx apps 2016-12-15 16:18:07 +01:00
Simon Grätzer e4951835aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-14 10:40:03 +01:00
jsteemann 3be94b6014 add caching for db._collection() on client side 2016-12-13 16:05:29 +01:00
jsteemann 4d76ef962b added count(details = true) for sharded collections 2016-12-13 16:03:49 +01:00
Kaveh Vahedipour 1c6837d0d9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-13 15:36:23 +01:00
Kaveh Vahedipour 842d1030f0 Fixed dangling UUID problem in missing database directory 2016-12-13 15:36:19 +01:00
jsteemann 03acaaea47 fixed issue #2217 2016-12-13 14:19:55 +01:00
Simon Grätzer 3a4a07f13d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-12 13:21:51 +01:00
Alan Plum 3e93980ae9
Generate unique Swagger operationIds 2016-12-12 02:32:50 +01:00
Alan Plum 9a81d2cb63
Add support for Swagger tags 2016-12-12 02:32:50 +01:00
Alan Plum cd98d53ec4
Add swagger route to Foxx API 2016-12-12 02:32:49 +01:00
Alan Plum f2a6864db4
Require at least one arg in route def 2016-12-12 02:32:49 +01:00
Simon Grätzer 4fe234803e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 17:37:51 +01:00
Kaveh Vahedipour fe8301cd31 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 16:40:02 +01:00
Kaveh Vahedipour 2b9c018817 fixed resilience 2016-12-09 16:35:32 +01:00
Simon Grätzer 820c5e0bc0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 15:51:11 +01:00
Andreas Streichardt c7ef0dc63a Update zwagger 2016-12-09 15:30:03 +01:00
Alan Plum d8bf7252e2
Document OAuth1 2016-12-09 15:28:36 +01:00
Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	scripts/startLocalCluster.sh
2016-12-09 14:30:19 +01:00
Andreas Streichardt 9fedba9fff Fix eslint 2016-12-08 10:14:50 +01:00
Andreas Streichardt 82682f8d25 Wait for synchronous replication to settle 2016-12-07 18:38:15 +01:00
Andreas Streichardt 10f7d75651 Fix uniform shard distribution when creating collections 2016-12-07 18:38:15 +01:00
Jan Steemann 5911f14bba updated CHANGELOG 2016-12-07 13:23:09 +01:00
Alan Plum 0700cfa86a
Implement OAuth 1.0a 2016-12-06 18:30:11 +01:00
Kaveh Vahedipour 30a0243e3d redirects to myelf should be hinstory 2016-12-06 18:05:05 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Simon Grätzer b126e1dddb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-06 14:57:09 +01:00
Michael Hackstein dd0dca8a8d This actually fixes the last commit... 2016-12-06 13:45:55 +01:00
Michael Hackstein 06e66754bb Fixed cluster version of Optimize non-edge index tests. It is deactivated now, the cluster decides differently on the indexes. 2016-12-06 13:33:23 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00
hkernbach a6ec84af9a node view now using short name 2016-12-05 12:17:06 +01:00
Simon Grätzer 3142cc1505 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-05 01:19:56 +01:00
Simon Grätzer 0689ccaabb fixed some stuff, stopping still not working 2016-12-05 01:18:05 +01:00
jsteemann 2aa414f731 fixed issue #2204 2016-12-02 13:59:48 +01:00
jsteemann 2521dff57c fix error message returned by arangoimp in case of some secondary unique key constaint violations 2016-12-02 13:37:17 +01:00
jsteemann dc5384609c jslint 2016-12-01 14:39:28 +01:00
Simon Grätzer 34714f8743 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-01 14:11:14 +01:00
Michael Hackstein 0bdf926942 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-30 12:56:46 +01:00
Kaveh Vahedipour 805f894368 fixed faulty output when primary db server from changeSecondary api could not be found 2016-11-30 11:27:54 +01:00
Michael Hackstein 1b5df32d8d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-29 12:49:19 +01:00
Michael Hackstein 0f119172dd Added convenience function to create vertexCentric indexes. 2016-11-29 12:31:25 +01:00
Jan Steemann 8443d4317e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-29 10:59:45 +01:00
Jan Steemann 6754761273 fix index persistence 2016-11-29 10:59:38 +01:00
Michael Hackstein 4331af37f9 Added a test for Skiplists and traversals, if the condition cannot cover _from resp _to inside the index. 2016-11-29 10:27:08 +01:00
Frank Celler 7e46422cbf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-28 17:32:57 +01:00
Frank Celler 4b1b6a2e7f Added test for Traverser using indexes not containing _from or _to 2016-11-28 17:32:04 +01:00
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Michael Hackstein d72d129860 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-25 16:09:06 +01:00
Michael Hackstein 0786eb735f Fixed passing of unique when using createHashIndex() 2016-11-25 16:08:58 +01:00
Kaveh Vahedipour 029ff44bb0 Merge back FMH to devel 2016-11-25 16:03:13 +01:00
jsteemann c784c54799 fix failing test 2016-11-25 15:45:59 +01:00
Michael Hackstein 69afcc0501 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-25 12:58:57 +01:00
Michael Hackstein 7c96010711 Reincluded ensureGeoConstraint. Somehow got lost in my last commit. 2016-11-25 12:58:48 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +01:00
jsteemann d09ac31051 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 11:18:56 +01:00
Michael Hackstein 37b124593f Unified ensureIndex on client and server libs. 2016-11-25 11:11:45 +01:00
Kaveh Vahedipour 41e1ba144f general transactions in agency comm 2016-11-25 09:24:41 +01:00
jsteemann 817933c77b bugfixes for sync replication and collection status in cluster 2016-11-24 17:00:57 +01:00
Andreas Streichardt f81df6aa86 Add unittest for hashindex collision bug 2016-11-24 15:09:54 +01:00
Andreas Streichardt c4f5cb7474 debug logging 2016-11-24 13:27:58 +01:00
Alan Plum 4edb258ebb
Fix breaky multi-deps 2016-11-24 09:33:39 +01:00
Simon Grätzer 66951f4f8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-23 13:17:27 +01:00
Kaveh Vahedipour 681455777c Merge remote-tracking branch 'origin/devel' into FMH 2016-11-23 08:51:51 +01:00
Michael Hackstein 90c646fc54 Added another smart graph error that disallows using system attributes for smart graphs 2016-11-22 17:54:12 +01:00
Kaveh Vahedipour f0e1168e5a Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 17:48:36 +01:00
Kaveh Vahedipour 9733dcc724 Looks as if cluster.my-local-info and cluster.myid are for the past 2016-11-22 17:48:04 +01:00
Simon Grätzer cbaca25ba1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-22 15:15:33 +01:00
Andreas Streichardt c1db7228c7 Coordinator will not always wait for system collection replication 2016-11-22 15:07:00 +01:00
Alan Plum a854cbf674
Fix Windows file path resolution 2016-11-22 14:02:01 +01:00
Kaveh Vahedipour ab34880bea Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 10:30:25 +01:00
Andreas Streichardt 2abc46f3e6 fix shardview...no more endless loops during shard rebalancing...also
fix error management when trying to reach dbservers
2016-11-21 17:47:06 +01:00
Simon Grätzer e4bc60a755 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-21 17:44:12 +01:00
jsteemann aa5bd85b4f fix log message 2016-11-21 14:06:10 +01:00
jsteemann 63f0b53db5 removed useless log message 2016-11-21 14:04:16 +01:00
Jan Steemann 689c7fbdc3 fixed issue #2183 2016-11-21 13:41:49 +01:00
Jan Steemann 0ff5e4c07c wrote tests for shell return codes 2016-11-21 11:34:49 +01:00
jsteemann 38e18a9e65 fix test 2016-11-21 08:45:37 +01:00
Alan Plum 2f07366b8f
Implement process.stdout.isTTY 2016-11-19 18:42:29 +01:00
Alan Plum d6a063e28d
Allow multi-dependencies in Foxx 2016-11-18 17:22:07 +01:00
Alan Plum 593274b095
Sanitize paths in fm.requireService 2016-11-18 17:22:07 +01:00
Alan Plum 5493420a81
Make deps immutable 2016-11-18 17:22:07 +01:00
hkernbach bfda3d4bc0 ui: better smart graph support 2016-11-18 15:18:25 +01:00
Alan Plum e12ba2ad3b
Allow descriptions in Foxx dependencies 2016-11-18 15:13:25 +01:00
Simon Grätzer 9b1a11e68f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-18 14:44:29 +01:00
Kaveh Vahedipour eec8f22953 Merge remote-tracking branch 'origin/devel' into FMH 2016-11-18 12:19:53 +01:00
Alan Plum 2ed6d8cc3e
Discard unknown Foxx configs in production
Fixes #2162
2016-11-18 11:47:00 +01:00
jsteemann be7ab673f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-17 17:31:34 +01:00
jsteemann 6b8157625f fixed test 2016-11-17 17:31:28 +01:00
Alan Plum a73ce31e7b
Change format of Foxx API listScripts route 2016-11-17 17:29:51 +01:00
Alan Plum 4ee67e1660
Fix CORS test 2016-11-17 17:29:50 +01:00
Kaveh Vahedipour a8339e5b4c Merge remote-tracking branch 'origin/devel' into FMH 2016-11-17 16:21:38 +01:00
Kaveh Vahedipour acb187851f Merge pull request #2153 from de3/devel
fix upgrade/install foxx in cluster environment
2016-11-17 15:34:35 +01:00
Jan Steemann e0831b1897 fixed missing description 2016-11-17 14:58:37 +01:00
hkernbach 5668141572 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-17 11:59:45 +01:00
hkernbach 5106fee4b8 fixed issue: #2161 2016-11-17 11:59:36 +01:00
Simon Grätzer 0ae6d0d6fd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-17 11:56:29 +01:00
Alan Plum 04d70bbfe8
Add development option to Foxx API install 2016-11-17 11:29:53 +01:00
hkernbach e49e872214 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-17 11:17:31 +01:00
hkernbach 2fb13ebda6 better cleanup in gv 2016-11-17 11:16:50 +01:00
Alan Plum 5978461ffe
Add download route to Foxx API 2016-11-16 18:49:56 +01:00
Alan Plum ce154316b1
More graceful handling of contributors without e-mail in Aardvark 2016-11-16 16:44:31 +01:00
Kaveh Vahedipour ffe7f9f3ad merged in devel 2016-11-16 14:59:53 +01:00
Alan Plum 89b59a522a
Add tests for Foxx path logic 2016-11-16 11:38:00 +01:00
Alan Plum ff415076d9
More convenient `@arangodb/request` 2016-11-16 11:37:59 +01:00
Simon Grätzer c97a0b825c Runtime Statistics, fix in javascript 2016-11-16 11:09:09 +01:00
Jan Steemann 1ad7d5e4a4 removed warning 2016-11-16 10:20:28 +01:00
Simon Grätzer 84ca321fe5 Fixed javascript API 2016-11-15 23:19:44 +01:00
Simon Grätzer 4b3a5a414e More js APIs 2016-11-15 21:19:36 +01:00
Simon Grätzer 42782e4e28 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-15 18:14:50 +01:00
Simon Grätzer 5b08879209 Added pregel arangosh code 2016-11-15 18:14:35 +01:00
Alan Plum d1c52e696c
Merge branch 'dotdot' into devel 2016-11-15 18:10:17 +01:00
Alan Plum 57cd82f88c
Fix swagger static path resolution 2016-11-15 18:08:06 +01:00
Alan Plum 8f6f022616
Unescape parts during Foxx routing 2016-11-15 17:38:15 +01:00
hkernbach 1e44df85ca fixed #2169 2016-11-15 16:08:40 +01:00
jsteemann 77e2cf5a65
fix passing of special chars in URLs in cluster
- this sets option CURLOPT_PATH_AS_IS to keep ".." and other special components in paths
- this also changes the behavior of StringUtils::urlEncode() to always encode the "."
  character to "%2e"
2016-11-15 15:46:22 +01:00
Alan Plum facee370fa
Fix static file serving for paths wth dots in them 2016-11-15 15:41:33 +01:00
hkernbach c47ec3bbd5 eslint 2016-11-15 15:32:11 +01:00
Heiko Kernbach aa55634419 eslint 2016-11-15 15:31:30 +01:00
hkernbach 1649b2cd59 added rule to eslint conf 2016-11-15 14:40:21 +01:00
hkernbach d245cda324 replaced grunt semistandard with eslint 2016-11-15 14:31:07 +01:00
Wilfried Goesgens 330ec1c5cb fix lint 2016-11-15 12:55:03 +01:00
Jan Steemann 19f771fcd6 issue #2168 2016-11-14 17:30:19 +01:00
hkernbach b8fd680df7 ui aql graph preview default is now canvas 2016-11-14 12:50:53 +01:00
Alan Plum 5788b2e3ca
Fix failing test 2016-11-13 15:08:40 +01:00
Alan Plum c0a3f5a8a1
Better Foxx API error handling 2016-11-12 22:33:07 +01:00
jsteemann ecaf2fd16b when querying edge index selectivity, pass attribute name (i.e. _from, _to) so the selectivity of the correct index part can be returned 2016-11-11 11:01:04 +01:00
jsteemann fcacd76bca display index usage of traversals in AQL explainer output (previously missing) 2016-11-10 12:49:02 +01:00
Jan Steemann 6d6d5b9a00 test for issue #2149, issue #2159 2016-11-09 16:29:58 +01:00
hkernbach 22e63fe308 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-09 14:48:33 +01:00
hkernbach e6a448230e fixed part of #2067 2016-11-09 14:48:29 +01:00
Jan Steemann a64127fdd8 added missing functions 2016-11-09 08:06:53 +01:00
Alan Plum 461cfdfcc2
Don't expose configuration in dev mode error page
Fixes #2156.
2016-11-08 16:41:10 +01:00
Jan Steemann 836905d341 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-08 16:09:18 +01:00
Jan Steemann f0f90bc914 small fixes for traversal explain output 2016-11-08 16:08:58 +01:00
hkernbach 4f7b5c2249 optimized resizing 2016-11-08 15:39:49 +01:00
Jan Steemann 8504246217 changed behavior of toJSON() function when serializing an object before saving it in the database
if an object provides a toJSON() function, this function is still called for serializing it.
the change is that the result of toJSON() is not stringified anymore, but saved as is. previous
versions of ArangoDB called toJSON() and after that additionally stringified its result.
2016-11-08 15:39:06 +01:00
Alan Plum 0779b99d99
Fix Foxx development mode HTTP API 2016-11-08 13:23:24 +01:00
hkernbach fcabefbe12 optimized docs view 2016-11-08 11:42:26 +01:00
Edi 69ee438be3 fix upgrade/install foxx in cluster environment
When install/upgrade, arangodb response is "No such file or directory".
This is because serviveInfo path already join with temporary Path, and then
in "uploadToPeerCoordinators" it join twice with temporary path.
Another problem, arangodb upgrade url is "update" not "upgrade".
Last problem, when Sync foxx with another cluster, use "coordinatorTransactionID"
but there is no that key response from ArangoClusterComm.
2016-11-08 08:02:53 +07:00
Alan Plum 3e49650d17
Bump graphql-sync to 0.6.x compat 2016-11-06 13:30:03 +01:00
Alan Plum ccb251e1f5
Better handling of routers & middleware in Swagger
Fixes #2148.
2016-11-04 20:06:08 +01:00
hkernbach 2dce0a9c8b js semistandard 2016-11-04 14:51:06 +01:00
hkernbach 5efb3d2ce8 ui added regex filter 2016-11-04 09:47:15 +01:00
hkernbach d19e314b04 fixed display of wrong version within the login screen 2016-11-03 17:05:36 +01:00
hkernbach 2fdaca29df added aql graph preview fallback to json if graph engine fails 2016-11-03 16:30:33 +01:00
jsteemann fa56edf192 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-03 12:20:40 +01:00
jsteemann b7257b196d safety first 2016-11-03 12:20:33 +01:00
hkernbach cd00bd8d07 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-03 11:44:35 +01:00
hkernbach 8ba0ecc194 added shortcuts to in/decrease font size in aql editor 2016-11-03 11:44:28 +01:00
Alan Plum 735f0e5f6c
Resolve 'lib' for 3.x services
Fixes #2139.
2016-11-03 10:35:06 +01:00
Alan Plum ce79aa9d18
Bump dependencies to latest versions
Fixes #2138.
2016-11-03 10:35:06 +01:00
hkernbach e669d64b6a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-03 09:37:17 +01:00
hkernbach c345474bca optimized version indicator 2016-11-03 09:37:11 +01:00
jsteemann 096c01af22 fix typo in message 2016-11-03 00:42:53 +01:00
jsteemann 68317bb4f2 added experimental `REGEX_REPLACE` AQL function 2016-11-03 00:40:19 +01:00
jsteemann cae493f060 increase default number of results for AQL editor 2016-11-02 22:19:44 +01:00
jsteemann cf27b1d5c5 fix bugs in front-end query builder
- filtering on multiple, different attributes did not work
- select boxes for filter operators did not contain IN, NOT IN and like for all but for the top-most select box
2016-11-02 22:06:03 +01:00
hkernbach 4ab8671bff issue #2131 - display process and error of pending or failed index creations 2016-11-02 14:56:49 +01:00
Simran Brucherseifer 9f2ad47aa4 Aardvark: Prevent logo from touching main content 2016-11-01 13:03:30 +01:00
Alan Plum f630020269
Expose static req.reverse as module.context.reverse 2016-10-31 17:38:11 +01:00
Alan Plum 41c0f6928d
Allow passing config & deps on install/upgrade/replace 2016-10-31 16:13:32 +01:00
jsteemann 62632a52c1 Merge branch 'unique-indexes-on-more-than-shardkeys' of https://github.com/arangodb/arangodb into devel 2016-10-31 16:00:34 +01:00
Michael Hackstein 8f0a1f47f8 Fix for ShoretestPath in Cluster. Does only show up with > 1 shards. Adapterd tests to use 4 shards instead of 1. 2016-10-31 09:19:49 +01:00
jsteemann eb2ba21596 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-28 13:45:02 +02:00
jsteemann 5a4a8ede2a jslint 2016-10-28 13:44:11 +02:00
jsteemann 2a371cbf9e allow creating unique indexes on more attributes than present in shardKeys
The following combinations of shardKeys and indexKeys are allowed/not allowed:

shardKeys     indexKeys
        a             a        ok
        a             b    not ok
        a           a b        ok
      a b             a    not ok
      a b             b    not ok
      a b           a b        ok
      a b         a b c        ok
    a b c           a b    not ok
    a b c         a b c        ok
2016-10-28 13:04:12 +02:00
Andreas Streichardt f9204cf71c Remove useless debug output 2016-10-28 12:50:22 +02:00
Kaveh Vahedipour 32049dd2c5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-27 15:18:23 +02:00
hkernbach e5abaffa6d removed console log, optimized offline view 2016-10-27 15:05:33 +02:00
Kaveh Vahedipour 5c38455fbd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-27 15:04:43 +02:00
Kaveh Vahedipour 985c0a4318 fixed sporadic failure of foxx apps to start 2016-10-27 15:04:26 +02:00
hkernbach 451c115223 grunt 2016-10-27 13:50:35 +02:00
hkernbach 693109de47 fixed event loop bug, optimized nodes view 2016-10-27 13:50:26 +02:00
Alan Plum 33b6a2b8eb
Fix failing swagger test
Adds missing signature variant for endpoint.response method.
2016-10-26 21:06:19 +02:00
Alan Plum 0950520eb5
Implement inline middleware 2016-10-26 18:16:18 +02:00
Alan Plum 4770e38fa1
Don't load mocha QUnit interface
The QUnit interface interferes with the BDD and TDD interfaces resulting in weird inconsistencies.
2016-10-26 15:24:56 +02:00
Frank Celler 62f4acc325 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-10-26 14:49:16 +02:00
Alan Plum a999dee906
Add scripts route to Foxx API 2016-10-26 11:41:08 +02:00
Jan Steemann 1e84dd9008 added test cases 2016-10-25 18:44:32 +02:00
Jan Steemann 8236ae2a05 added tests 2016-10-25 16:51:58 +02:00
Kaveh Vahedipour 457034b305 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-25 16:26:09 +02:00
Jan Steemann 70b6bff545 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-25 15:52:40 +02:00
Jan Steemann eead95db34 issue #2118 2016-10-25 15:50:42 +02:00
Kaveh Vahedipour e7f8bf7d7d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-25 15:08:04 +02:00
Kaveh Vahedipour f8235b9c63 agency locks code review 2016-10-25 15:07:57 +02:00
hkernbach 23e15889c7 fixed shardDistribution info route 2016-10-25 13:40:28 +02:00
hkernbach 4e23a6911d moveShard api changed 2016-10-25 10:09:03 +02:00
jsteemann 09e1fda1a0 fix revision id handling 2016-10-24 17:24:27 +02:00
Jan Steemann b9a807092b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-24 15:26:37 +02:00
Jan Steemann 8f785e1701 generated API docs 2016-10-24 15:26:23 +02:00
hkernbach f8b7b602ba gv colors 2016-10-24 14:11:16 +02:00
hkernbach 1fd4625188 gruntfile cleanup 2016-10-24 14:08:25 +02:00
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
Frank Celler e4ba82e8e9 rewrite of AgencyComm 2016-10-23 00:46:30 +02:00
Max Neunhoeffer aee23cc9a5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-21 15:43:38 +02:00
Max Neunhoeffer 5e743a2a69 Allow to specify good keys in smart vertex collections. 2016-10-21 15:42:25 +02:00
hkernbach 2a8ba62d2c grunt 2016-10-21 15:21:53 +02:00
hkernbach be442d38c7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-21 15:21:03 +02:00
Michael Hackstein e092c4a4b3 Fixed smartGraph frontend issues 2016-10-21 15:10:15 +02:00
hkernbach 7f11d016ea removed not needed icons 2016-10-21 14:53:40 +02:00
hkernbach cf0ffe53f9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-21 13:22:18 +02:00
hkernbach b6e3cb75d2 bugfix force layout node positioning 2016-10-21 13:22:10 +02:00
Max Neunhoeffer 75ecf79277 Large scale inquisition of agency. 2016-10-21 10:34:46 +00:00
hkernbach d5ed52d4bb ui filter bugfix 2016-10-21 11:58:58 +02:00
Max Neunhoeffer c695d60a2d Merge branch 'devel' of https://github.com/ArangoDB/ArangoDB into devel 2016-10-21 09:13:01 +00:00
hkernbach fa12cb8ebd improved gv 2016-10-21 10:31:16 +02:00
hkernbach 8f5312f83e ui improved import feedback 2016-10-21 10:31:06 +02:00
Max Neunhoeffer 6d96e51883 Catch an exception in wait for sync replication. 2016-10-21 06:45:48 +00:00
Michael Hackstein dbeaeda1fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 18:13:19 +02:00
Michael Hackstein 319481dea7 Fixed babies and errors in AQL Modification cluster blocks. 2016-10-20 18:13:11 +02:00
Max Neunhoeffer 638ce07e6d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-20 15:10:38 +02:00
Max Neunhoeffer 01a386cdc1 Correct some comments. 2016-10-20 15:10:22 +02:00
Alan Plum 245819ea9c
Add Foxx HTTP API 2016-10-20 15:09:36 +02:00
Alan Plum 6aaa55f9dc
app -> service 2016-10-20 15:08:18 +02:00
Alan Plum c76af3012b
Replace service doc on update 2016-10-20 15:05:23 +02:00
Alan Plum c7940bdb42
More readable names 2016-10-20 15:04:45 +02:00
Alan Plum f271774e59
Fix manifest license SPDX format 2016-10-20 15:04:09 +02:00
Frank Celler 0883c49cd2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-20 13:15:07 +02:00
Frank Celler 7ab630fabc Removed cluster special case for xxxByExample. 2016-10-20 13:11:24 +02:00
hkernbach 0a349d0816 aql editor graph preview bugfix 2016-10-20 12:51:55 +02:00
hkernbach 6a3857688a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 12:23:01 +02:00
hkernbach dc9c244b10 ui version 2016-10-20 12:22:55 +02:00
jsteemann 5730d0bdc4 fixed jslint 2016-10-20 11:34:18 +02:00
hkernbach 327b5e7022 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 08:26:58 +02:00
Andreas Streichardt e2fc190e1b No ipv6 on travis..fail 2016-10-19 17:45:37 +02:00
hkernbach 0345c24006 scss 2016-10-19 17:03:56 +02:00
Andreas Streichardt 954e02ef24 Implement endpoint test...proper socket cleanup 2016-10-19 16:22:36 +02:00
hkernbach 25ef505c75 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-19 16:10:47 +02:00
hkernbach 092356d058 improved gv 2016-10-19 16:10:36 +02:00
Michael Hackstein 4fac851560 Added some better handling of SmartEdgeCollections in simpleQueries. 2016-10-19 15:19:33 +02:00
hkernbach f09482b505 gv 2016-10-19 12:32:10 +02:00
hkernbach 494cf75cc6 gv bugfix 2016-10-19 10:10:44 +02:00
hkernbach cd3a5b4e45 ui fixed cached query restore 2016-10-19 08:47:36 +02:00
hkernbach e181457fac issue: #2112 2016-10-18 17:44:38 +02:00
Frank Celler 11055082ea Make --verbose true work in testing.js for cluster. 2016-10-18 13:32:12 +00:00
hkernbach 6bc276ed41 grunt 2016-10-18 14:25:17 +02:00
hkernbach d6bfee26cd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-18 14:23:52 +02:00
hkernbach 90c2025957 ui graph management bugfix 2016-10-18 14:23:39 +02:00
Jan Steemann 3c96c6f428 fix jslint 2016-10-18 13:55:10 +02:00
Jan Steemann 47382b20d7 issue #2115 2016-10-18 13:54:33 +02:00
hkernbach abbd47099f ui version 2016-10-18 10:49:02 +02:00
Simran Brucherseifer 7a5b653599 logo: make edition more subtle 2016-10-17 18:00:07 +02:00
Simran Brucherseifer c6716cf5ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-17 16:48:06 +02:00
hkernbach 7b5e53ad3b logo 2016-10-17 16:10:21 +02:00
hkernbach d26c361db7 grunt 2016-10-17 16:06:56 +02:00
hkernbach b8d35c131c login view 2016-10-17 16:02:42 +02:00
hkernbach 450aac6e05 grunt 2016-10-17 15:57:44 +02:00
hkernbach 0aba389179 ui graphs 2016-10-17 15:56:41 +02:00
hkernbach a962809687 logos 2016-10-17 15:56:26 +02:00
Andreas Streichardt 4ad6ddef3b Fix naming 2016-10-17 14:00:58 +02:00
Michael Hackstein 1243dc503d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-17 13:58:31 +02:00
Michael Hackstein 7f3b67170a Removed obsolete JS Coordinator truncate() implementation. All done in cxx now. 2016-10-17 13:58:14 +02:00
Andreas Streichardt ad2327022e Merge remote-tracking branch 'origin/devel' into authentication 2016-10-17 13:51:26 +02:00
Andreas Streichardt 1318fa313b Implement cluster authentication 2016-10-17 13:35:55 +02:00
hkernbach 0fddf50040 grunt 2016-10-17 12:46:34 +02:00
hkernbach e730118074 ui smart graph 2016-10-17 11:56:21 +02:00
hkernbach 5d554f9bf3 ui edition mechanism 2016-10-17 11:55:34 +02:00
Max Neunhoeffer c9cf9a60c8 Put some debug messages in log level debug. 2016-10-14 18:48:11 +02:00
hkernbach df391b242b ui graphs 2016-10-14 17:29:18 +02:00
hkernbach 6002682eb2 grunt build 2016-10-14 17:02:28 +02:00
hkernbach 841ba88fdd scss 2016-10-14 16:59:31 +02:00
hkernbach 23720b3363 gv improvement 2016-10-14 16:59:17 +02:00
hkernbach fc6c42f27a gv improvement 2016-10-14 16:59:01 +02:00
hkernbach fa802beda7 ui state 2016-10-14 16:58:40 +02:00
hkernbach 70e8673c4f smart graph ui 2016-10-14 16:37:32 +02:00
Simran Brucherseifer 40ae762a5c Remove unused images from Aardvark assets 2016-10-14 15:56:55 +02:00
Simran Brucherseifer ef6ce95c14 Update Aardvark favicon.ico (and remove unused and unknown icon) 2016-10-14 14:48:47 +02:00
hkernbach 0edec08ceb scss 2016-10-14 14:22:01 +02:00
Jan Christoph Uhde f1c3c89d77 Merge branch 'devel' of github.com:arangodb/arangodb into devel
* 'devel' of github.com:arangodb/arangodb:
  Fix #2110
  allow users to get information about themselves
  added a newline before generated text
  More logging in AgencyComm.
2016-10-14 10:13:02 +00:00
Jan Christoph Uhde 620b0e6777 switch to boost asio
Squashed commit of the following:

commit 946c37a9247fc2c5bafb91d8ffd8d62096376214
Merge: 6b1957c 52877d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 14:03:31 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      More logging of _role and _leaderID changes in agency.
      queryView #2111
      Better logging of redirects.
      Automate mac build - DRY for prefixes, directories etc. - possibility to provide build.sh with the prefix
      try to locate brew installations of openssl
      More logging in redirect case in AgencyComm.
      css
      ui query profiling
      Added Documentation for SmartGraphs via HTTP.
      return meaningful error message
      grunt build
      queryview bugfix
      typo
      fixed collection create bug
      typo
      Fixed JS syntax bug in gharial module
      added shards keys to coll. info view

    Conflicts:
    	Installation/Jenkins/build.sh

commit 6b1957c84276792c3ee32ec97ab5e943910498ec
Merge: 7235be0 79c0f54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 11:28:33 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      Add more logging about shard creation/dropping/cleaning.

commit 7235be03b8152227e7b315045d90d9b995cd3036
Merge: ddbd020 c576426
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 11:02:51 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      Increase some timeouts from 60 to 90s to be more load tolerant.

commit ddbd0209ddbf0a2ed535c385ed0787533ed6c284
Merge: a5bf367 f949b49
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 10:17:36 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      Fix a typo.
      left-align table headers in query result view
      Work on the macos Bundle scripts

commit a5bf367b72f2679aa8ba83a2cd509028b6b6e924
Merge: 56aef8f a5e51e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 10:17:12 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb: (30 commits)
      Further fixes in gharial for SmartGraph support.
      Increase timeout to test ttl.
      fix typo
      Fix AQL REPLACE for smart edges.
      semistandard
      Fix performRequests?
      Adjust comments about TRI_usleep and usleep.
      fixed compile warning
      queryview bugfix, color
      added missing legend and color
      "ressources" => "resources"
      add state "loading collections" to query profile results
      colors, gv
      query view, images
      performance optimization
      As we wait for arangodb to be up and running, we should also wait for its shutdown on deinstall.
      f*in with nsis
      fix one more typo
      Fix syntax error
      Work around more cmake / cpack / nsis vodoo
      ...

    Conflicts:
    	arangod/Cluster/ClusterComm.cpp
    	arangod/RestHandler/RestReplicationHandler.h

commit 56aef8f6a8d6106dd717ecde1cd37a6a87cc7fa4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 14:28:33 2016 +0000

    add missing function to RestDemoHandler.h

commit 819995d0a65fe5450f655e572086e4b4999b9e48
Merge: 0561bc8 300066f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 16:07:26 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (34 commits)
      More logging in case of strange timeouts.
      Different agents log in different files.
      Fix windows config paths for the PKGDATADIR
      Fix windows compile
      Remove debugging
      Another place we need the binaryPath for windows
      cppcheck
      Fix windows compile
      fix compile warning
      Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs
      More places to pass along the binaryPath for teh windows
      fixed issue '"WARNING DefaultCustomTypeHandler called" on read'
      its nullptr on windows too.
      Protect memory accesses to _snapshot in Supervision.
      We also need to know the binary directory when looking up the config file; else we may miscalculate file locations.
      disable optimizations for package builds to least common denominator.
      - Fix enterprise package naming for windows & mac - add missing `make package` target for mac
      Fix a bug in RemoveBlock.
      Add support for AQL REMOVE for smart edge collections.
      Fix paths
      ...

commit 0561bc82374cb8ee61d8b5587ef10895a1bfe580
Merge: 302b5f2 682ec09
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 09:17:14 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      dont re-send request in case of connection timeout
      fix segfault when connection is gone

commit 302b5f2a1311b0537246d3ca767edf213e27cff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 09:15:55 2016 +0200

    add - extra log message for timeout)

commit 682ec09985f4c10f95022be3c11b5f5587793f57
Merge: 0251d33 2760ea0
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:49 2016 +0200

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

commit 0251d33da34b43758d71be98f675404c531b4def
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:36 2016 +0200

    dont re-send request in case of connection timeout

commit ca6565d9e20eaffb7786c6e13283640ed070b749
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:21 2016 +0200

    fix segfault when connection is gone

commit 2760ea03923e4a870c2b48fbfd40d6107faeb069
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 11 09:37:42 2016 +0200

    cancel keep alive timeout when calling handler

commit 0f0add4cf2da57464f3b7dbcbfc8db864b735bfb
Merge: 250dd05 0bfe447
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Oct 10 17:17:24 2016 +0200

    Merge remote-tracking branch 'origin' into boost_asio_mops_schleife

commit 250dd051114c120bcbc1dcaf2a7d10da609d9cf2
Merge: 5dd1e85 5a59619
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 11:47:05 2016 +0000

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:

commit 5dd1e85b699616fc5585c53d4cdaca6cdef76401
Merge: 58cf544 04c49f6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:46:18 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      fix curls CMake

commit 5a59619599fc5c7d442af65906a00770602d953d
Merge: 1103c97 60f7d9d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 13:42:52 2016 +0200

    Merge remote-tracking branch 'origin/devel' into curl-communicator

commit 58cf544f99c51232a8dc5ed2664be4001068eceb
Merge: 6563b98 60f7d9d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:40:38 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (35 commits)
      Fix dump/restore tests.
      Add a sensible default.
      MSC_VER is an integer
      fix compilation on windows broken by 4e8fc9b665
      overview documentation of agency
      overview documentation of agency
      fixed license path
      Added agency HTTP API
      switch to bold
      Update Version.cpp
      extend the compiler type with compiler-version
      creating snap package (with -DUSE_SNAPCRAFT=ON)
      Create snap.cmake
      Create snapcraft.yaml.in
      Link jemalloc staticaly.
      overview documentation of agency
      Revert "Fix return value of local edge write to smart edge collection in AQL."
      Fix return value of local edge write to smart edge collection in AQL.
      Fix writing of edges in AQL to smart edge collections.
      Changes necessary for AQL INSERT for smart edge collections.
      ...

commit 6563b98850722c1ed45db7737576ca7e73b9a437
Merge: f0b59f1 1103c97
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:05:24 2016 +0200

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      Add proper cleanup
      clang format
      Do threaded resolving in curl...because otherwise we will have timeouts (klingt komisch, is aber so)
      error buffer
      bool fail
      Add errordetails
      Boolfail :S

    Conflicts:
    	arangod/Agency/Agent.cpp
    	arangod/Cluster/ClusterInfo.cpp
    	lib/SimpleHttpClient/Communicator.cpp
    	lib/SimpleHttpClient/Communicator.h

commit 1103c97b8ad3a398ee1df53cd2226ee45d4a4c73
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:53:01 2016 +0200

    Add proper cleanup

commit 9fdc5858bc32e2d7a34271e8ee08c4e931127451
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:51:52 2016 +0200

    clang format

commit 19769f13bb6faad02a23a5750f9fb295d47fb847
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:00:45 2016 +0200

    Do threaded resolving in curl...because otherwise we will have timeouts
    (klingt komisch, is aber so)

commit 04c49f64240fcbec1b44143f295c8c4fdcb03b54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 09:21:05 2016 +0000

    fix curls CMake

commit 715f41f172406dacafa809e5ca1c075c10fab7cf
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:52:38 2016 +0200

    error buffer

commit 0fd78ec9d1789000959b0770afc384bd5f740c13
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:41:55 2016 +0200

    bool fail

commit 7d71bd590c101f9d1161eacfed24053bada5c3bc
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:32:54 2016 +0200

    Add errordetails

commit 25bab33fb50edbd2a159e601e9e4ceddf3ff3fee
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Fri Oct 7 18:30:25 2016 +0200

    Boolfail :S

commit f0b59f1ff2e374e54e50af14c2ab129d6b053a19
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 11:43:32 2016 +0000

    release strand at the end

commit b3512b4d5a0284e5907a51656666b5e0482d3298
Merge: 7bbe0c6 d08fe7f
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Fri Oct 7 16:08:17 2016 +0200

    Merge branch 'devel' into curl-communicator

commit f1ee42104c4a3b46e69c1a66c5c3290f1c0b13b7
Merge: 7a79485 7bbe0c6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 13:57:05 2016 +0000

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      fixed windows compile errors

commit 7a794855d7174414514a7003d53e68f0e9e0dc6e
Merge: 2917f1b d08fe7f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 13:56:43 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      add option to disable processor specific optimisations
      fix AQL tests in cluster
      don't write undefined into the errors file if no GDB output is there
      Modified the internal constructor of general graph to use a single json object instead of several input parameters.
      Improve collection handling in AQL (still far from good).
      Modernized general-graph module. It now uses ES6 class syntax.
      Testing.js now starts in enterprise mode if possible.

commit 2917f1b49f8d8b50046ac5c00ce51fe158d7e121
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 12:51:22 2016 +0000

    fix asio shutdown

commit b472335448ba0ac1c00e270d498506c49272add1
Merge: a6e4d12 ecc3b56
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 14:10:30 2016 +0200

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

commit a6e4d128d05ee03df7510509467cba3f81dda89e
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 10:42:27 2016 +0000

    added clearHandlers

commit 7bbe0c68b64fcc81ec17474f67bc4cafe4c61e50
Author: Mark <mark@arangodb.com>
Date:   Fri Oct 7 10:47:43 2016 +0200

    fixed windows compile errors

commit 4f41c5dffa2191ddcd677aa774c36de3d7d9dde3
Author: Wilfried Goesgens <willi@arangodb.com>
Date:   Thu Oct 6 18:19:16 2016 +0200

    output exit signal

commit 8152513d152c5d7912d9f62e423bb1a0075bad64
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:22:32 2016 +0000

    added clearHandlers

commit 5ce884b3c3abcae562dd26df97a99b30d9745b7c
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 14:26:24 2016 +0000

    added reset for asio handler

commit 4be942d98c8ff6a051344ad01685682e985d2210
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:55:53 2016 +0200

    added reset

commit 2d18a0175cef55b9f41097a5a31b1ec85574f2fe
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:55:19 2016 +0200

    removed warning

commit 0d6e033dd83938fff6c3013c9e965cfb58d53722
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 10:11:34 2016 +0200

    fix typo

commit 02a7726fbcd012a22c62a8bee09f4dfa96583bc3
Merge: f9a2ae5 794b0e0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 09:57:17 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      need to call cancel before erase

commit f9a2ae5fa17517089b5ca4f2d37d92a73243dbbf
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 09:54:55 2016 +0200

    try to fix shutdown by consuming all work by calling run_one in a loop

commit 94b679a3a0f2daa1fe4588809356672e2035fed2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 5 07:50:39 2016 +0200

    fix leak

commit 794b0e00d5b66d8d57486b007f666b5ee5027648
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Oct 4 16:06:26 2016 +0200

    need to call cancel before erase

commit c7a3107d69aed7052b3cea42b4b8deed37ac19e2
Merge: c5b3840 21298c3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:49:53 2016 +0200

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      Revert "making it build partly out of source"

commit c5b3840b23a7e0ed77b53f333cba964c8cdc7a5d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:24:19 2016 +0200

    add call to curl multi cleanup

commit e57aad9cfab3466bba69f1fce9dd567a57b5cdbd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:14:51 2016 +0200

    fix call curl global cleanup

commit f80f50a809dfef03079393c4472fce863e0524a0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 14:10:48 2016 +0200

    add suppressins file for asan

commit 21298c36026d0d63282a2c17b37b082f4bab7101
Author: U-WIN-O80T0OH79D8\jenkins <jan@uhdejc.com>
Date:   Tue Oct 4 12:33:10 2016 +0200

    Revert "making it build partly out of source"

    This reverts commit 82eea7a19e722ae5d89efb38140aaadcbd53d398.

commit f3b21b211df92a0d96d1476b74333d41a9060c7d
Merge: 3a5993d 595fc9b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 12:09:17 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (27 commits)
      moveShard with distributeShardsLike
      moveShard with distributeShardsLike
      moveShard with distributeShardsLike
      linux fixes
      more authentication events, fixed changePassword
      arangodb::aql::Collection::shardIds for smart edge colls.
      Fix a typo.
      Edge indexes have now ID 1.
      grunt build
      fixed typo
      gv fixes
      grunt build
      ui - move aql result into graph viewer
      added different path for different editions
      Do not wait for synchronous replication to settle when creating a database.
      distributeShardsLike now stores CID
      Fix error handling for ClusterInfo::getCollection.
      distributeShardsLike now stores CID
      Fix enterprise version for non-smart and single server graph traversals.
      shards view [ci skip]
      ...

    Conflicts:
    	arangod/RestHandler/RestAuthHandler.h
    	arangod/RestServer/arangod.cpp

commit 3a5993d9e94cdfc635b038df923984d1802e7383
Merge: df57ad9 3ac64be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:44:46 2016 +0200

    Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife

    * origin/curl-communicator:
      Add CURL_STATICLIB globally
      Finally set variables correctly
      Disable tests
      Remove debug
      Do not use MS scale timeout
      Add curl build dir
      Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS style variable...
      curl static against openssl
      Add curl
      making it build partly out of source
      Curl on windows
      Make the crc message status (so it doesn't pop up as red in the cmake ui)

commit df57ad959b79da789ead2058fe8440e97cd09d74
Merge: b3653e9 b4e5123
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:22:45 2016 +0200

    Merge branch 'boost_asio' into boost_asio_mops_schleife

    * boost_asio:
      replace our ssl init calls with boost::asio::ssl calls
      fix ssl in cluster

commit b4e5123798e62954c683af073b4db3191a395a61
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:07:40 2016 +0200

    replace our ssl init calls with boost::asio::ssl calls

commit 3ac64be8a4b0e95162401b87b3cac903897be082
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Tue Oct 4 10:22:06 2016 +0200

    Add CURL_STATICLIB globally

commit e93940cb0c1905d8157070adc8cce13c0b11bd5c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 09:51:44 2016 +0200

    fix ssl in cluster

commit 833722cdd151edac81b4834a0b838961b87aca99
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 18:44:24 2016 +0200

    Finally set variables correctly

commit 663822cc23cee0001eb7faf5419719eac77849da
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 18:02:17 2016 +0200

    Disable tests

commit c0d7a9a73fcf9f42de7c13b87af02d7db326d586
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 17:12:55 2016 +0200

    Remove debug

commit 28367243f8c3b79fcf99f16017e9360b2e2f9ac9
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 17:12:09 2016 +0200

    Do not use MS scale timeout

commit ceaa2682baf3bb0a028cdb5211a0c334d5db23b3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:39:04 2016 +0200

    Add curl build dir

commit b3653e93a890745b32db11f45506b723d67fc99d
Merge: e000dab 11a9d3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 16:25:47 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (23 commits)
      local cluster start update
      aql editor now handles queries running in the background
      slightly higher timeout for notifications
      oops useless assignement
      arangod/Cluster/ClusterInfo.cpp
      gv save settings bugfix
      Add #2038 to changelog
      Handle multiple request body models
      agency bug resolved
      color optimization query profiling
      Fixed Smart graph injection of collections.
      fix compile warning
      grunt build
      semistandard
      ui - cacheable explain
      improved query ui
      fixed long waits on dropping shardless collections
      lintify
      Faster creation of smart edge collections.
      Make AQL aware of smart traversals for enterprise.
      ...

    Conflicts:
    	arangod/Agency/Agent.cpp

commit 624eec008c842ff0f48a1b259de54097618353c3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:12:38 2016 +0200

    Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS
    style variable...

commit e8a6173b74490fda4c57ab18708c929ed4f5a22c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:03:28 2016 +0200

    curl static against openssl

commit 522177b71132c6277fd4c08630bbfae3a509fdf8
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 15:20:42 2016 +0200

    Add curl

commit 82eea7a19e722ae5d89efb38140aaadcbd53d398
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 15:19:14 2016 +0200

    making it build partly out of source

commit e000dab111721d8cb9548b26d9e2dc9015a4fbf4
Merge: e08ada2 b3ae63b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:59:19 2016 +0200

    Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife

    * origin/curl-communicator:
      Remove request unittest
      Implement cURL based inter server communication

    Conflicts:
    	arangod/Cluster/ClusterComm.cpp

commit 25b01518a5fb2ba2d047b082ac6596b44e13008c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 10:58:30 2016 +0200

    Curl on windows

commit e08ada250ca283d59328c7577f1d3e9affa55aeb
Merge: 8c4ad1d 16d1d21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:19:35 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio_mops_schleife

    * origin/devel:
      ui slow connection bugfix, cleanup
      Updated the general-graph module to ignore SmartGraphs which are enterprise only.
      Fix output of _id attribute for new documents in smart edge collections.
      Fix virtual cloning of LogicalCollections and derived types.
      Describe current format of document _key
      Docs: adds links to AQL traversal for anonymous graphs
      small ui shard fix
      Silence a compiler warning in enterprise mode.
      Remove isSmart attribute in community edition for Agency.
      Improve an if statement.
      grunt build
      modified cluster nodes ui
      ui logos
      added functionality to see the movement status of a shard
      Adding Smart Edge Collection drops to v8-vocbase
      Add SmartVertexCollection.

commit 8c4ad1d63a68c7cfb99cf61cc22148b774b5b0dc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:06:19 2016 +0200

    add comment about potential issue

commit 31317b300da44e3f7e19d8fd5a781d3ef5440702
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 09:46:26 2016 +0200

    Make the crc message status (so it doesn't pop up as red in the cmake ui)

commit b3ae63bd7974f762fb2499416402186199811818
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed Sep 28 15:59:27 2016 +0200

    Remove request unittest

commit f5bc6efc263d9159c6c2134309c7a8e11d50789d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed Sep 28 15:58:55 2016 +0200

    Implement cURL based inter server communication

commit c5760194cde05ca73426ef4672ba97fe41ac0083
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 15:30:32 2016 +0200

    fix ssl server test (bad weak ptr)

commit 136100991320261b15c0277941992086bfa07c57
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 15:04:50 2016 +0200

    better output

commit 495a3b65fc360c4dd8a1277f129d81bbba57493c
Merge: 635bc9f 8a5bc21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:27:44 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (63 commits)
      elderly cmake compatibility
      spec files rather like 0/1 than fales/true
      Forward isSmart to Agency.
      Restrict _from_ replacement (etc) to the beginning of the string.
      enterprise id lookup
      calculate systemd unit directory in cmake instead of leaning on specfile finding it in some rpm magic
      cluster ui fix
      Fix hanging dbservers in graph tests.
      We don't need go anymore.
      fix sortedness documentation (additional clarification)
      Fix branch choice.
      fix creation of run directories - these shouldn't be in the client package
      updated CHANGELOG
      issue #2079
      Added some smart info into logical collection and make sure that virtual collections are created via load plan
      make relative temporary paths absolute during the system startup. This fixes #1896
      follow redirect for dumpagency
      New depth first search simulators.
      fixed test, typo, optimization
      version info
      ...

    Conflicts:
    	CHANGELOG
    	Installation/Jenkins/build.sh
    	arangod/Agency/RestAgencyHandler.cpp
    	arangod/RestHandler/RestReplicationHandler.cpp

commit 635bc9fae42b7b16fffabebe3303f92e240bbf5f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:19:25 2016 +0200

    fix request statistics

commit 9462a446f73f6e82ff870131938f73d3eae3bd25
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:15:01 2016 +0200

    silence boost warnings

commit 836289100b64a5f3ef8173446f08eaba60752770
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 10:16:34 2016 +0200

    better log messages

commit 2dbb8d2438f895c380612f0a2bf097928b43191d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 14:51:39 2016 +0200

    clean up of KeepAliveTimeout

commit 6c97d8f21dfd4b5e41fa507465875833ca75554d
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 12:25:16 2016 +0000

    removed TaskData & chunks

commit 71bd6d83eb7cac58de1a4473af4d4e9e262ab50f
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 11:54:32 2016 +0000

    fixed name

commit 821eb554305073325a4b68864cba065705f0fac3
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 11:54:20 2016 +0000

    added missing state transition

commit 119171859612b864a290cde321ba1f80ba51eb62
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 13:43:17 2016 +0200

    added WAIT_FOR

commit 41e6d3108d64467583a79d3d9dd2096f0dded26b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 12:45:12 2016 +0200

    print more info about connection in communication.debug mode

commit 22c83f8b695d745e4531896b4b5815bba1b10eba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 11:14:17 2016 +0200

    fix handling of timeout. add new event after resetting

commit 66c8247e1ce3fb4a69c5375c0f61b2b57f20c217
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 09:43:33 2016 +0200

    keep alive timeout is now able to take values less than a second

commit 19b6cf554de78d8fec16cd370243ccc59aa345bc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 16:48:02 2016 +0200

    add keepalive timeout

commit f03757998cae93b3ddc31eded83ea69cebc09039
Author: Mark <mark@arangodb.com>
Date:   Mon Sep 26 14:30:24 2016 +0200

    fixed windows compile errors

commit f4dec34e77f02995bdaba0a73c88aadccad37524
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 11:24:15 2016 +0200

    add option for maximal VPackChunkSize to the server

commit a2fccca23411368fa819785223949fefcdc962c8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 09:47:38 2016 +0200

    initialize connection info - server/client address/port

commit 5df04763c03e227965065946b8f170654e36c59e
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 11:02:18 2016 +0000

    cppcheck fixes

commit 2a47e4e99bad63c92f1834c738cf30f0e465a1b4
Merge: 278ba49 1bdf414
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:47:12 2016 +0000

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

commit 278ba49a87762365ea37fc3fb5040259a1e3df75
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:46:45 2016 +0000

    free vocbase on cancel

commit e3b36c8418a816076449be3dea29f865b4952229
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:28:22 2016 +0000

    check if handle have been installed

commit 92aac95b39c9fc7b3d712b4770e3b3c420626ef9
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 16:21:50 2016 +0000

    fixed batching

commit 92d1335cf2a6bd296c23aa8165718fd4d283af6d
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 14:04:47 2016 +0000

    fixed leak of ListenTask

commit 5d4fb6fd1250e0a30fbe2326d11087ba3ae13b1c
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:34:47 2016 +0000

    fixed shutdown

commit c6fb584266818eef765aa8b6727858ab2100859a
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:15:05 2016 +0000

    handle shutdown

commit 7dcc50214e3e51ef58d3823ec70534354e1a98eb
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:14:54 2016 +0000

    handle aborts

commit 35dd9da84a69dda4103cc82be47d740550d49069
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 10:57:57 2016 +0000

    cppcheck fixes

commit 2f9f7d87005e48904711a9b4a2863ddb98834f79
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 20:57:41 2016 +0000

    added cancel

commit b4696026ec9cee01f196a7096a86d29cdf8ce202
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 21:30:10 2016 +0200

    convert _scheduler in SchedulerFeature to unique_ptr

commit 0475c6dd7bdd3c842860e85ad26a607df675d600
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 17:34:07 2016 +0200

    implement synRun

commit a2b365613b5779dd59004b8cfcca04ef145c3ad3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 16:35:34 2016 +0200

    fix error caused by RestHandler not beeing created as shared_ptr

commit 8f19bbb03efa2d2bc6106b8b456040ce7cbb0c68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 16:32:38 2016 +0200

    fix some cppcheck errors

commit 7694392f73f920df4c033d98025112189d19aa00
Merge: eea0fd7 35e14fd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 14:54:59 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio

    * origin/devel: (43 commits)
      cleanup
      speed up tests
      add setUpAll, tearDownAll
      modified collection info view
      rechecking dbservers before sharding operations
      updated CHANGELOG
      issue #2072
      adjusted progress indicator delay
      nodes view
      fixed wrong navi route
      updated CHANGELOG for #2071
      updated CHANGELOG
      issue #2071
      fixed compile error
      updated CHANGELOG
      issue #2070
      Some refactoring in Transaction. Also enterprisified document
      FailedServer jobs can report when last FailedLeader has been processed
      Fixed optimization of ANY in Traversals. It was included in the traverser who actually cannot handle it.
      FailedServer jobs can report when last FailedLeader has been processed
      ...

    Conflicts:
    	CHANGELOG

commit eea0fd7c42fc55cd4a1233f458c990186ad6cfc2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 14:31:00 2016 +0200

    improve error handling and reporting in SocketTask

commit 505d55d1a1feff6c93388c5c401273d4199438a7
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 11:56:48 2016 +0000

    removed duplicate store

commit 14669814e0eaab9a4c78c8f4396dc88181f6a4fa
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 11:34:31 2016 +0200

    missing self for callback

commit 8ad4ee25ef7aaa4cc9cf01d6fe3f56d805e3e9c2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 11:10:31 2016 +0200

    do error handling with error codes instead of exceptions for asio

commit c1d7375c1b0ab0fd3f7f3c682baa2946c05fc4ec
Merge: 9be5942 0e073aa
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 23:03:07 2016 +0200

    Merge remote-tracking branch 'origin/FMH' into boost_asio_merge_frank

    tests broken!

    * origin/FMH:
      added move
      WIP
      WIP
      added shared_from_this
      added shared_from_this
      WIP
      WIP

    Conflicts:
    	arangod/GeneralServer/GeneralCommTask.cpp
    	arangod/GeneralServer/RestHandler.cpp
    	arangod/GeneralServer/RestStatus.cpp
    	arangod/GeneralServer/RestStatus.h
    	arangod/RestHandler/RestBatchHandler.cpp
    	arangod/Scheduler/Scheduler.h

commit 0e073aaee9508129da6b1c83661e08050e172bff
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 22 16:00:28 2016 +0000

    added move

commit 9be5942d18c5dfd66c41c5520b7cdf54025e7ed0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 16:10:31 2016 +0200

    change default chunk size

commit e17d2e4828b1abc4837db0fe7c5ef88d31ddf063
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 15:58:23 2016 +0200

    multichunk sending is now working

commit 3144b72f7883b5b0f3d1df8f4acf0ec996a70e4f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 15:40:43 2016 +0200

    try send multiple chunks

commit f7f1ff11fb47eac7e289b78b9bf4dd0adea0285a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 14:55:41 2016 +0200

    git commit prepare sending of smaller chunks

commit 50088a7006bc7ac94e4706a50382831214a5c0a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 14:54:03 2016 +0200

    change cmake for boost

commit 29b00dcd8354144fad5048add5621d657b5f54b1
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 13:12:50 2016 +0200

    fix linking issues on windows caused by auto-linking feature of boost

commit 05da308660cbf67d84a62cdbd11c71e02d8cad7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 13:12:13 2016 +0200

    remove forward declaration that prevents build on windows

commit 521ce1aebf055fedd9ad42bd63d91d65e4f34f42
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:53:11 2016 +0200

    disable autolinking code for linux

commit b67dc616340319591370957149827d2a0e4ad995
Merge: 2ac2440 467a949
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:25:56 2016 +0200

    Merge branch 'boost_asio' of github.com:arangodb/arangodb into boost_asio

    * 'boost_asio' of github.com:arangodb/arangodb:
      work on sending in small chunks

commit 2ac244015b6556d52b99906612ff3feaad3d60ab
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:25:15 2016 +0200

    update boost in cmake

commit 467a949263a21d1b0af886d01fa471f568c21343
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 10:59:37 2016 +0200

    work on sending in small chunks

commit 4d0816808b701af217db9c4faccd3ef780efb79c
Author: Frank Celler <frank@arangodb.com>
Date:   Wed Sep 21 15:42:06 2016 +0200

    WIP

commit 8c7d3dbca6a34080df1d807e0ec35b57b0acc172
Author: Frank Celler <frank@arangodb.com>
Date:   Wed Sep 21 15:39:54 2016 +0200

    WIP

commit 6d5b19939ae2fbeb157d3773d415b6cf980f3fd5
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 17:25:15 2016 +0200

    added shared_from_this

commit b297b3a702de303212edfc3545602b5b4fb987f9
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 17:25:06 2016 +0200

    added shared_from_this

commit 5fb39bf9e9ce03c291dadfd48f84f94a12f488d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:47:18 2016 +0200

    fix windows errors

commit b3f71399e12cc5e59e1bbdb4ca87b7d588fb7da9
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:36:55 2016 +0200

    add TaskData.h to GeneralServer.cpp and GeneralListenTask.cpp

commit da99cb2e3151f454ef346ded57c2d4865125ab7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:11:49 2016 +0200

    replace magic number with boost::asio::error::would_block

commit a10aa87742153aab5a5aca53815ff44a2abc98f0
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 16:11:24 2016 +0200

    WIP

commit 368d62245efad52178acf279ff4f54eb8b03e8e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:35:18 2016 +0200

    add boost to arangod_v8

commit 2ef495a1d1aed97b6eb1c106107a90a27e1891ba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:25:09 2016 +0200

    remove .gitignore

commit 6005aed8b24a40e4fcc6f0569407cd10c8a973c0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:18:21 2016 +0200

    fix more windows errors

commit e322da8eb08254c661781cea442cd6e403069ecd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:00:48 2016 +0200

    force boost system to be static

commit 6082736132272f600de5f9d76805dde373bc742b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:43:53 2016 +0200

    another fix for windows

commit a36f6930fca35662e21b762bb323c2dc36a05e5a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:39:02 2016 +0200

    fix add namespace to Socket

commit 38eeda76ad0a145176c5b05ae75d4640a3514cc4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:30:38 2016 +0200

    fix namespace / include

commit 26513ae75a22911d5b4e8584f5e8ae9314469999
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:19:18 2016 +0200

    try to get boost working on windows

commit 00b6416a6452fef0d8e43424ea4e1735c3b0e614
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:06:05 2016 +0200

    replace #warning with #pragma message - windows

commit bf455d30047ebd37a037fc24522bc502854cbbe8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:03:38 2016 +0200

    improve cmake for boost

commit 6c491e5e784c0c33cf282b5d64026b61d60711a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:39:46 2016 +0200

    apply fix for windows

commit a9f9f429d8eba25b8f7215399e41dd5524bfd76b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:33:33 2016 +0200

    replace FAILED with FAIL so windows has no problem

commit 3cbac4115ef183ae38676584abef41b914d2592e
Merge: c614242 19f667c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:09:14 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb:
      fixed incompatible replication API responses
      updated CHANGELOG
      added experimental AQL functions `JSON_STRINGIFY` and `JSON_PARSE`
      added experimental support for incoming gzip-compressed requests
      fixed issue #2060
      Added a hash and equals comparator for velocypack that only takes _id into account.
      vs warnings in agency
      Made the Base Traverser Engine pure virtual

    Conflicts:
    	CHANGELOG
    	arangod/GeneralServer/HttpCommTask.cpp
    	arangod/RestHandler/RestReplicationHandler.cpp

commit c614242c4beb2ed12ccb29fcc6fa1db6a4d9090f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 10:49:19 2016 +0200

    try to fix RestReplicationHandler

commit 74b5fc33477107be62a5d86c9c04563cc4d7cac5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 09:12:14 2016 +0200

    remove CMakeFiles form .gitignore so git clean will work again

commit c330b1bff7acb6022b06e2499fa3a065fb820b82
Merge: d400b7f 5772054
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 09:10:39 2016 +0200

    Merge branch 'boost_asio' into boost_asio_devil

    * boost_asio:
      renamed Task2 to Task, EventLoop2 to EventLoop
      WIP
      remove https und vpps commtasks
      WIP

commit d400b7fde3c6a7b6d1c2e2cad600a3fb32b65533
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 08:49:38 2016 +0200

    Revert "remove useless file"

    This file sets indent to 2 spaces for almost all editors,
    this way we do not need modelines or change the default
    editor configuration on systems.

    This reverts commit e0503f7092.

commit 40dcd9ec34e3c741ffdb97d4101e53c49d0ac163
Merge: d5526cf ebb67be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 08:40:00 2016 +0200

    Merge remote-tracking branch 'origin' into boost_asio_devil

    * origin:
      Remove outdated information about suppress-shape-information which was removed with ArangoDB 3.0, as reported by Tomek on Stackoverflow.
      remove useless file
      updated CHANGELOG
      examples about stacked escaping
      Fix generated MD5sum file
      make methods private
      speed up collection.any()
      speed up skiplist index
      fixed ssl_server test
      examples about stacked escaping
      more diagnostics

commit 8875f7bfc22cc4376b703060e85ac0141706aca5
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 18 22:53:16 2016 +0200

    WIP

commit 57720546a31a59668cd57e99d3dbc11ecfa41a8d
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 11:09:39 2016 +0200

    renamed Task2 to Task, EventLoop2 to EventLoop

commit eca7b17f6910fc7892f6a4dbe9c618d3e8f7bf05
Merge: ca473e8 8f2c13e
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 10:53:11 2016 +0200

    WIP

commit 8f2c13ec0e2f8a4be4b136bd263affc3054654ae
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 09:10:56 2016 +0200

    WIP

commit ca473e8a0eee4ed04994f70b3d52defc9127810c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 16:19:26 2016 +0200

    remove https und vpps commtasks

commit d5526cf1b606daa26be628efa9fdca2fe2664d95
Merge: 5337a01 c912d96
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 16:01:39 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (39 commits)
      Fixed compile bug.
      TraverserOptions now support proper subclassing.
      Added a virtual base class for traverser engines.
      all lambdas in ClusterInfo might have been left with dangling references.
      all lambdas in ClusterInfo might have been left with dangling references.
      fix compile error
      Correct path to enterprise js code in testing.js.
      Finding graphs by name now resolve externals one step earlier.
      potentially fix leak
      removed unused flag
      get rid of two pointers in each transaction operation
      redirect output of gdb, so we can append it to the jenkins error mails.
      Foxx: post route example that accepts an array of objects
      implement use-local-time for slow queries as sugested in #2051
      fixed windows compiler warnings
      lookupGraphByName now has a non-enterprise implementation.
      Removed a graph optimization which increased the minDepth if a filter is defined on a higher depth. Under some circumstances this filter can be matched if the path is not long enough.
      fixed issue #2052
      reporting in inception
      fix assertion
      ...

commit 5337a0116ca20726795c59666cdfd6786f93cc82
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 15:53:12 2016 +0200

    ssl server is working again

commit fcedf60588681518b0f6d3eb05661ec0f9e201d7
Merge: 322a08a c912d96
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 15 14:48:54 2016 +0200

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

commit 322a08a86eb9de101d0e37be5e3f6bdbdcb19345
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 15 14:47:19 2016 +0200

    WIP

commit 6f64f39744e3d34c48e69b9a742497d109f2464d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 13:04:46 2016 +0200

    get encryption type via ConnectionInfo in SocketTask

commit abda1c4e1b8e0f05a15a47458fc6c9aaee4abeb4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 09:52:58 2016 +0200

    add ssl support via asio - we are in a broken state now

commit a6a3215f5244a96a48fc5fe4545313018c181b68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 09:47:36 2016 +0200

    Fix cmake so it works with boost asio

commit baccaa00dc041e01822bfef723d6d285ab2c7ff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 13 16:20:23 2016 +0200

    add basic changes to enable ssl

commit f7971e2f727ade913ce00958e0ad77e2e4c01613
Merge: c1c7b4e fee42ee
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 13 09:52:44 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio

    * origin/devel:
      Fixed ASSERTION guarding undefined behaviour on Mac. In some cases the assertion did throw.
      Remove debug output.
      simplified expression
      warning removed
      speed up looking up of revision ids
      Constructor of TraverserEngine is now protected. Preperation for SmartGraphEngine (EE Only).
      Fixed undefined behaviour on Mac. An empty vector was popped.
      semi-fix for long delays in multi-host-agency collection creation/drop
      semi-fix for long delays in multi-host-agency collection creation/drop
      Link the CONCAT_SEPARATOR function.
      Set agencySize back to 1 (temporarily).
      Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however.
      Make testing.js find enterprise tests in enterprise version.
      Add global.ARANGODB_CLIENT_VERSION to arangosh.
      Silence gitjslint.sh tool w.r.t. warnings.
      reformat
      Fix which attribute names are allowed for shardKeys.
      Typo fixes in docs
      x-compile portability.
      Silence cpack rpm build.

commit c1c7b4e61e5cecf9794e83f8b3bf5a965d460a53
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 12 12:09:19 2016 +0200

    add boost_system via pure cmake!

commit c5d227eebffe311b24bc1d67c209d53eee0b0754
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 11 21:24:58 2016 +0200

    WIP
2016-10-14 10:12:17 +00:00
Alan Plum c2452ddc99
Fix #2110 2016-10-14 11:54:55 +02:00
Frank Celler d22408f027 allow users to get information about themselves 2016-10-14 11:31:10 +02:00
Simran Brucherseifer 0482327ff0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-14 11:17:29 +02:00
Simran Brucherseifer 7161227b14 Add docs and test for AQL DISTANCE function 2016-10-14 11:17:29 +02:00
hkernbach ad59437d70 queryView #2111 2016-10-13 15:53:51 +02:00
hkernbach 8259e783cd css 2016-10-13 14:46:43 +02:00
hkernbach 1a1587d6a3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-13 14:46:03 +02:00
hkernbach 0d75ebe3aa ui query profiling 2016-10-13 14:45:54 +02:00
Michael Hackstein f393164a77 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-13 13:37:07 +01:00
Michael Hackstein faf6f871d3 Added Documentation for SmartGraphs via HTTP. 2016-10-13 13:37:00 +01:00
hkernbach c9df6c29ec grunt build 2016-10-13 14:30:39 +02:00
hkernbach 89ecfd5a19 queryview bugfix 2016-10-13 14:29:26 +02:00
hkernbach cbde64b258 typo 2016-10-13 14:24:54 +02:00
hkernbach 4f4725b25c fixed collection create bug 2016-10-13 14:24:44 +02:00
hkernbach 698fa4daeb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-13 14:16:14 +02:00
hkernbach d3bf18f158 typo 2016-10-13 14:16:08 +02:00
Michael Hackstein afeb6805a2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-13 13:11:07 +01:00
Michael Hackstein b096b09e85 Fixed JS syntax bug in gharial module 2016-10-13 13:10:43 +01:00
hkernbach 73bcd41476 added shards keys to coll. info view 2016-10-13 14:07:19 +02:00
Max Neunhoeffer 79c0f54072 Add more logging about shard creation/dropping/cleaning. 2016-10-13 13:26:20 +02:00
Max Neunhoeffer c576426bfa Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-13 12:53:18 +02:00
Max Neunhoeffer 039ca9aceb Increase some timeouts from 60 to 90s to be more load tolerant. 2016-10-13 12:52:59 +02:00
Frank Celler f949b49987 Fix a typo. 2016-10-13 10:15:23 +00:00
Simran Brucherseifer faf5e5a090 left-align table headers in query result view 2016-10-13 11:57:12 +02:00
Michael Hackstein a5e51e5459 Further fixes in gharial for SmartGraph support. 2016-10-13 10:22:07 +01:00
Max Neunhoeffer 20ead5affa Increase timeout to test ttl.
Under high load we have observed that 1.25 is too short for a ttl of 1.
2016-10-13 11:15:01 +02:00
hkernbach cc879f50e1 semistandard 2016-10-13 10:58:22 +02:00
hkernbach ebb36a6d45 queryview bugfix, color 2016-10-13 10:54:06 +02:00
Jan Steemann 9bd0aa002b added missing legend and color 2016-10-13 10:42:20 +02:00
Jan Steemann d12b52725a "ressources" => "resources" 2016-10-13 10:31:31 +02:00
Jan Steemann e88460efcb add state "loading collections" to query profile results 2016-10-13 10:31:16 +02:00
hkernbach 4150fa7ec7 colors, gv 2016-10-13 10:14:42 +02:00
hkernbach f9f96e765a query view, images 2016-10-13 10:08:54 +02:00
Max Neunhoeffer 034927fe20 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-12 16:26:48 +02:00
Max Neunhoeffer 2996a375ae Use correct path. 2016-10-12 16:26:15 +02:00
hkernbach d0ad61a030 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-12 14:55:00 +02:00
hkernbach 42d28f0708 nodes view 2016-10-12 14:54:49 +02:00
Max Neunhoeffer 300066f376 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-12 14:39:24 +02:00
Max Neunhoeffer b933900954 Different agents log in different files. 2016-10-12 14:25:37 +02:00
Michael Hackstein 13dc4915f8 Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs 2016-10-12 13:25:56 +02:00
jsteemann 7641dab658 fix tabular display for non-documents 2016-10-11 16:47:52 +02:00
Andreas Streichardt e75b8f5503 Implement cURL based inter server communication 2016-10-10 14:56:04 +02:00
Max Neunhoeffer 36efc9f15f Speed up dump tests by using babies. 2016-10-10 14:54:38 +02:00
Max Neunhoeffer f578ee394f Fixes in AQL write code to smart collections. 2016-10-09 11:09:00 +02:00
Michael Hackstein 6c64e61982 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-08 01:29:48 +02:00
Michael Hackstein ced62cdaf6 Some improvements in general-graph. Added a new Enterprise error 2016-10-08 01:28:53 +02:00
Max Neunhoeffer f316a9bc4c More changes for AQL writing to smart edge collections. 2016-10-08 00:48:23 +02:00
jsteemann b57913faaf next attempt to fix printing 2016-10-07 17:26:42 +02:00
jsteemann 8a62119ca3 function printing... 2016-10-07 17:14:26 +02:00
jsteemann d155b0ef77 attempt to fix ES6 class methods printing 2016-10-07 17:05:15 +02:00
jsteemann 18032835f2 print ES6 class attributes properly 2016-10-07 16:52:42 +02:00
jsteemann 2dc8deadc5 fix priting of arrow functions 2016-10-07 16:17:49 +02:00
jsteemann 0f49a6d8b7 make sort a bit more clever 2016-10-07 16:09:28 +02:00
jsteemann 5c6b840442 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-07 15:22:09 +02:00
jsteemann 848ca5b28c fix AQL tests in cluster 2016-10-07 15:21:58 +02:00
Wilfried Goesgens 51dd5a95b0 don't write undefined into the errors file if no GDB output is there 2016-10-07 15:15:33 +02:00
Michael Hackstein acae6e9486 Modified the internal constructor of general graph to use a single json object instead of several input parameters. 2016-10-07 13:19:06 +02:00
Michael Hackstein 68988a47e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-07 12:59:24 +02:00
Michael Hackstein 807e9cca3c Modernized general-graph module. It now uses ES6 class syntax. 2016-10-07 12:46:45 +02:00
Michael Hackstein 42739e276c Testing.js now starts in enterprise mode if possible. 2016-10-07 12:42:28 +02:00
Kaveh Vahedipour cf09546d93 fixed erroneous break of supervision agency updates 2016-10-07 11:01:45 +02:00
Jan Steemann 7123aca19c issue #2091: decrease connect timeout to 5 seconds on startup 2016-10-07 09:18:51 +02:00
Wilfried Goesgens 2d4e5ababc output exit signal 2016-10-06 18:19:16 +02:00
Wilfried Goesgens 440b5a2132 another foxx manager test which shouldn't stress github... 2016-10-06 18:02:22 +02:00
Kaveh Vahedipour 7b591fd409 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-06 15:32:57 +02:00
Kaveh Vahedipour 72bf15c118 Fixed moveShard to do distributeShardsLike in start instead of create 2016-10-06 15:32:41 +02:00
hkernbach 430149e83d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-06 14:39:49 +02:00
hkernbach fb03ff2cbb ui filter collection documents with subattributes 2016-10-06 14:39:40 +02:00
jsteemann f079569c04 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-06 14:04:22 +02:00
jsteemann d67c6372aa fixed issue #2086 2016-10-06 14:04:15 +02:00
hkernbach a35f25ce01 scroll bugfix query editor 2016-10-06 13:55:38 +02:00
jsteemann 112cd95c03 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-06 13:54:09 +02:00
hkernbach 92ef783f81 grunt deploy 2016-10-06 13:20:45 +02:00
Frank Celler 20d27ef67c fixed upgrade from 3.0 to 3.1 2016-10-06 10:12:23 +00:00
jsteemann 087a9bbdc9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-06 12:04:43 +02:00
jsteemann c934f8e8dd added AQL function `DISTANCE()` for distance calculations 2016-10-06 12:01:04 +02:00
Jan Steemann 1cbcc278da added test for issue #2081 2016-10-06 11:51:59 +02:00
hkernbach b107c6a58e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-06 10:21:43 +02:00
hkernbach db99916e8b improved gv 2016-10-06 10:21:35 +02:00
Kaveh Vahedipour 00b997c4b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-06 09:11:23 +02:00
Jan Steemann d9d6588151 fixed issue #2081 2016-10-05 18:08:50 +02:00
Kaveh Vahedipour ce8c1a0cac revisiting all supervision jobs 2016-10-05 17:16:02 +02:00
Wilfried Goesgens 016b595c6e implement matching for non-compressed systemd corefiles 2016-10-05 15:44:58 +02:00
Michael Hackstein 4ea624293d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-05 13:01:32 +02:00
Michael Hackstein cec7d79fc2 Added a new error code if a collection is not smart (EE only) 2016-10-05 13:00:43 +02:00
hkernbach 414b252c37 gv bugfix 2016-10-05 10:03:28 +02:00
hkernbach 3ba13e7b2c query view bugfix 2016-10-05 10:02:46 +02:00
hkernbach b27ad1288a gv bugfix 2016-10-04 21:36:05 +02:00
hkernbach f1d87f20f1 grunt 2016-10-04 19:36:13 +02:00
hkernbach dd229f82cf query editor usability 2016-10-04 19:35:36 +02:00
hkernbach 4936511b64 query editor bugfix 2016-10-04 19:10:35 +02:00
hkernbach 8cc6a5194a query bind parameter bugfix 2016-10-04 18:04:07 +02:00
hkernbach 5492f4d5b5 removed logs 2016-10-04 17:35:40 +02:00
hkernbach e01acdef53 grunt 2016-10-04 16:53:48 +02:00
hkernbach 19c76a3e1d gv create edge bugfix 2016-10-04 16:52:44 +02:00
hkernbach 6e7d77d17e grunt build 2016-10-04 16:43:06 +02:00
hkernbach 976a509b6c gv 2016-10-04 16:42:56 +02:00
hkernbach c467a462c1 semistanddard 2016-10-04 15:45:18 +02:00
hkernbach 7865c6d695 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-04 15:43:38 +02:00
hkernbach 6b0905314b graph viewer aql mode 2016-10-04 15:43:28 +02:00
Kaveh Vahedipour 9d3214c539 minor 2016-10-04 15:31:32 +02:00
Kaveh Vahedipour 595fc9b84e moveShard with distributeShardsLike 2016-10-04 11:41:26 +02:00
Frank Celler f83f6a7114 more authentication events, fixed changePassword 2016-10-03 19:54:54 +02:00
hkernbach 6bdac42839 grunt build 2016-09-30 16:37:59 +02:00
hkernbach 6fc312e542 gv fixes 2016-09-30 16:33:15 +02:00
hkernbach 752d200103 grunt build 2016-09-30 15:45:36 +02:00
hkernbach da0aff8ac2 ui - move aql result into graph viewer 2016-09-30 15:45:09 +02:00
Max Neunhoeffer f602132667 Do not wait for synchronous replication to settle when creating a database. 2016-09-30 15:06:25 +02:00
hkernbach ac5fb18463 shards view [ci skip] 2016-09-30 12:01:41 +02:00
hkernbach 8b605c8116 shardView 2016-09-30 11:58:37 +02:00
hkernbach 5445e44480 shard view 2016-09-30 11:48:13 +02:00
hkernbach d0afc59ec8 shard view 2016-09-30 09:09:23 +02:00
Max Neunhoeffer a5d582e04b Improve pseudo RNG. 2016-09-29 16:39:14 +02:00
hkernbach 226875acaf aql editor now handles queries running in the background 2016-09-29 15:51:56 +02:00
hkernbach 7281f2ad1a slightly higher timeout for notifications 2016-09-29 15:51:09 +02:00
hkernbach 750b5625cc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 15:18:18 +02:00
hkernbach 5c45d09612 gv save settings bugfix 2016-09-29 15:18:03 +02:00
Alan Plum fe4c4d166f
Handle multiple request body models 2016-09-29 14:16:42 +02:00
hkernbach c71a1fd5c9 color optimization query profiling 2016-09-29 14:03:26 +02:00
hkernbach 466c24ce83 grunt build 2016-09-29 13:38:37 +02:00
hkernbach d18b17f938 semistandard 2016-09-29 13:38:33 +02:00
hkernbach c288e65a06 ui - cacheable explain 2016-09-29 13:34:58 +02:00
hkernbach 49b200aab4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 12:51:39 +02:00
hkernbach 0c68de3291 improved query ui 2016-09-29 12:51:25 +02:00
Wilfried Goesgens dcbafac851 lintify 2016-09-29 11:38:35 +02:00
Kaveh Vahedipour ef551f1b8b shell handles the smart graph parameters for collection creation 2016-09-29 10:11:49 +02:00
hkernbach 16d1d21e66 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-29 09:52:13 +02:00
hkernbach 965c790c35 ui slow connection bugfix, cleanup 2016-09-29 09:52:00 +02:00
Michael Hackstein 939159fc9f Updated the general-graph module to ignore SmartGraphs which are enterprise only. 2016-09-29 08:46:37 +02:00
hkernbach bb9cc3b8fc small ui shard fix 2016-09-28 16:47:31 +02:00
hkernbach 1a32881bbb grunt build 2016-09-28 16:05:53 +02:00
hkernbach 47d514e89c modified cluster nodes ui 2016-09-28 15:58:44 +02:00
hkernbach 58905e2c98 ui logos 2016-09-28 15:57:59 +02:00
hkernbach c471f643a4 added functionality to see the movement status of a shard 2016-09-28 15:52:11 +02:00
hkernbach 4875c6a502 cluster ui fix 2016-09-28 10:51:45 +02:00
jsteemann a45322076a issue #2079 2016-09-27 16:34:39 +02:00
Max Neunhoeffer 5ae2dcaa08 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-27 15:57:47 +02:00
Max Neunhoeffer 9e2dc6eb36 New depth first search simulators. 2016-09-27 15:56:13 +02:00
hkernbach 124edb1294 fixed test, typo, optimization 2016-09-27 15:45:23 +02:00
hkernbach d5f7eeef77 version info 2016-09-27 15:10:21 +02:00
hkernbach fa4fa19d1b version info 2016-09-27 15:00:23 +02:00
hkernbach 0ddfdf2f24 grunt build 2016-09-27 13:36:33 +02:00
hkernbach 169698843d ui logo 2016-09-27 13:35:17 +02:00
Max Neunhoeffer bcbfa34503 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-27 13:26:01 +02:00
Max Neunhoeffer da725af78b Some fixes to helpers for graphs. 2016-09-27 13:25:40 +02:00
hkernbach 08423634a9 fixed a query profiling bug 2016-09-27 13:19:43 +02:00
hkernbach 4c36095ee5 gv improvements, gv error handling 2016-09-27 11:50:48 +02:00
Max Neunhoeffer 2913547320 Simulation support for BFS. 2016-09-27 10:59:39 +02:00
Max Neunhoeffer 40083d6019 Add a helpers file for graphs. 2016-09-27 00:12:17 +02:00
Kaveh Vahedipour 0e35927d04 fixed access to updated entitity in ClusterInfo 2016-09-26 16:25:06 +02:00
Kaveh Vahedipour 550189d0e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-26 16:00:15 +02:00
Kaveh Vahedipour cc0a4ffbaa supervision grace period introduced as command line argument. reappeared db servers are removed from failedServers 2016-09-26 16:00:07 +02:00
hkernbach b91352deb1 gv exporter settings 2016-09-26 15:56:48 +02:00
hkernbach 05c2c1976f gv 2016-09-26 15:52:33 +02:00
hkernbach 0acc163ac8 cluster statistics background pulling 2016-09-26 14:00:45 +02:00
hkernbach d4da684325 fixed statistics in cluster mode 2016-09-26 13:45:06 +02:00
hkernbach e685e811f0 added query profiling information 2016-09-26 11:03:19 +02:00
hkernbach 35e14fdab2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-23 14:14:59 +02:00
hkernbach ec16346e74 cleanup 2016-09-23 14:14:32 +02:00
jsteemann 9b951ff6c2 speed up tests 2016-09-23 12:20:10 +02:00
jsteemann 0b7d73bf3b add setUpAll, tearDownAll 2016-09-23 12:08:39 +02:00
hkernbach 33c54a9e7b modified collection info view 2016-09-23 10:41:58 +02:00
hkernbach 19c8e77aea rechecking dbservers before sharding operations 2016-09-23 10:21:20 +02:00
hkernbach b387ff6289 adjusted progress indicator delay 2016-09-23 07:57:20 +02:00
hkernbach ea9d97d5c6 nodes view 2016-09-23 07:55:09 +02:00
hkernbach 9f70262a2c fixed wrong navi route 2016-09-23 07:30:18 +02:00
hkernbach 635fbfeec5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-23 07:22:47 +02:00
jsteemann bbc0e8940c issue #2071
make the AQL query optimizer inject filter condition expressions referred to by variables during filter condition aggregation
for example, in the following query

    FOR doc IN collection
      LET cond1 = (doc.value == 1)
      LET cond2 = (doc.value == 2)
      FILTER cond1 || cond2
      RETURN { doc, cond1, cond2 }

the optimizer will now inject the conditions for `cond1` and `cond2` into the filter condition `cond1 || cond2`, expanding it to
`(doc.value == 1) || (doc.value == 2)` and making these conditions available for index searching.

note that the optimizer previously already injected some conditions into other conditions, but only if the variable that defined
the condition was not used elsewhere. for example, the filter condition in the query

    FOR doc IN collection
      LET cond = (doc.value == 1)
      FILTER cond
      RETURN { doc }

already got optimized before because `cond` was only used once in the query and the optimizer decided to inject it into the place
where it was used.
this only worked for variables that were referred to once in the query. when a variable was used multiple times, the condition
was not injected as in the following query

    FOR doc IN collection
      LET cond = (doc.value == 1)
      FILTER cond
      RETURN { doc, cond }

the fix for #2070 now will enable this optimization so that the query can use an index on `doc.value` if available.
2016-09-22 20:29:27 +02:00
jsteemann 5e26337548 issue #2070 2016-09-22 19:59:13 +02:00
Kaveh Vahedipour 5e43c204c7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-22 17:24:09 +02:00
Kaveh Vahedipour c793c3ac44 FailedServer jobs can report when last FailedLeader has been processed 2016-09-22 17:23:56 +02:00
hkernbach 57dbd8799e optimized cluster ui 2016-09-22 17:10:05 +02:00
hkernbach 3bfb30aa3e offline view 2016-09-22 13:32:17 +02:00
hkernbach 9ccf472f52 rerendering cluster statistics faster 2016-09-22 12:54:21 +02:00
Jan Steemann f0e14cff7d changed behavior of array comparison operators for empty arrays 2016-09-21 11:01:59 +02:00
Jan Steemann 243476e454 issue #2064 2016-09-21 08:56:51 +02:00
Wilfried Goesgens 2a5cdf7311 Fresh swagger. 2016-09-19 16:35:01 +02:00
Michael Hackstein d01c7ca32b Disabled {uniqueEdges: 'global'} and {uniqueVertices: 'global', bfs: false} in Pattern Matching query as their result is entirely non deterministic. 2016-09-19 13:28:43 +02:00
jsteemann e245e155a1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-19 08:59:16 +02:00
jsteemann 6d2a93d997 added experimental AQL functions `JSON_STRINGIFY` and `JSON_PARSE` 2016-09-19 08:58:52 +02:00
Jan Steemann a2deb13c8d fixed issue #2060 2016-09-19 08:50:13 +02:00
Kaveh Vahedipour 7806dde219 fixed ssl_server test 2016-09-16 13:14:08 +02:00
jsteemann fad7efe8c3 more diagnostics 2016-09-16 09:35:08 +02:00
Max Neunhoeffer 3435e973ec Correct path to enterprise js code in testing.js. 2016-09-15 10:25:57 +02:00
Wilfried Goesgens f3a2a91f12 redirect output of gdb, so we can append it to the jenkins error mails. 2016-09-14 17:13:41 +02:00
Michael Hackstein c6cd5574b1 Removed a graph optimization which increased the minDepth if a filter is defined on a higher depth. Under some circumstances this filter can be matched if the path is not long enough. 2016-09-14 10:23:34 +02:00
Jan Steemann 1a2a3ba448 fixed issue #2052 2016-09-14 08:28:20 +02:00
Wilfried Goesgens cde427e492 create failure report file regardless of whether its going to be empty; simplifies build pipeline. 2016-09-13 14:40:13 +02:00
Wilfried Goesgens 5c0791bb8f remove debug print 2016-09-13 14:13:42 +02:00
Wilfried Goesgens e4596de367 add fail suite for build pipeline testing 2016-09-13 14:12:21 +02:00
Kaveh Vahedipour bdf2b9a55e fix in timing and wanring 2016-09-13 11:04:51 +02:00
Max Neunhoeffer b686f23cb9 Set agencySize back to 1 (temporarily). 2016-09-12 14:12:49 +02:00
Michael Hackstein 8dd3105762 Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however. 2016-09-12 13:42:08 +02:00
Max Neunhoeffer 1c7ed5d86f Make testing.js find enterprise tests in enterprise version. 2016-09-12 12:20:50 +02:00
hkernbach a620690a32 grunt build 2016-09-09 17:29:09 +02:00
hkernbach 8546c56ff7 improved gv 2016-09-09 17:27:43 +02:00
hkernbach 294f117dbf added missing collection state - frontend 2016-09-09 17:27:02 +02:00
Kaveh Vahedipour 8b6f0e1f51 agency supervision turned off for quickietest 2016-09-09 15:03:12 +02:00
Kaveh Vahedipour b98975344d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 14:47:07 +02:00
Kaveh Vahedipour 16a35ee15a multi-host agency in tests 2016-09-09 14:46:54 +02:00
Max Neunhoeffer 8fef636106 Allow for detailed version query in arangosh. 2016-09-09 14:30:57 +02:00
hkernbach ee65a1a375 fixed issue #2005 2016-09-09 13:39:15 +02:00
hkernbach c8923c1021 improved gv 2016-09-09 13:16:57 +02:00
jsteemann a9902fe02d fixed typo 2016-09-08 17:52:29 +02:00
jsteemann 50ff529244 jslint 2016-09-08 17:34:59 +02:00
Michael Hackstein adec2b1c50 Fixed traverser test. Which has two possible results 2016-09-08 17:07:12 +02:00
Michael Hackstein a3ba4b249d DBServer collections now use a cluster-wide unique id for their cids. Better handling of waiting for replication. 2016-09-08 16:26:17 +02:00
jsteemann 2df53c92ce Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 09:51:24 +02:00
Kaveh Vahedipour 4e9f455094 too verbose messages from cluster.js 2016-09-08 07:38:10 +00:00
jsteemann 183208de6b Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 15:45:44 +02:00
Michael Hackstein 7a2a0ddc0e Fixed another statistic test in graph traverser. 2016-09-07 15:27:05 +02:00
jsteemann 8ef63acf55 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 15:24:51 +02:00
jsteemann d749052081 jslint 2016-09-07 15:23:33 +02:00
jsteemann 64f8d7ae87 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 15:10:58 +02:00
Michael Hackstein 446e5dddfc Fixed graph traversal tests in cluster. They use a different index than local server and hence reporting is different. 2016-09-07 14:50:40 +02:00
Andreas Streichardt e2782a7376 implement tests checking that writing to the hideen agency stuff is
forbidden
2016-09-07 14:03:22 +02:00
jsteemann 7ae36773ec moved implementation of `/_admin/wal` REST handlers to C++ 2016-09-07 13:48:52 +02:00
jsteemann 528ebdf573 slightly prefer primary index 2016-09-07 11:42:13 +02:00
jsteemann 32d35f25af Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 10:35:29 +02:00
Mark 03d7e3ea0a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-07 10:31:49 +02:00
Mark e417e34d0e changed default for keepNull of modifyVertex/modifyEdge to true in Gharial 2016-09-07 10:31:35 +02:00
Andreas Streichardt d258e75cd1 Fix jslint 2016-09-07 10:31:08 +02:00
jsteemann 98dc073774 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 10:01:49 +02:00
jsteemann 84b750597d added test 2016-09-07 10:01:35 +02:00
Jan Steemann f80b36b6ff Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-07 09:59:49 +02:00
Jan Steemann a79c8360d4 fixed issue #2039 2016-09-07 09:59:41 +02:00
jsteemann e1c847b0f6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 09:52:38 +02:00
Kaveh Vahedipour 55df580c78 bug fix in shutdown timer for tests 2016-09-07 09:49:47 +02:00
Max Neunhoeffer 104fc6aeed Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-07 09:47:20 +02:00
Max Neunhoeffer 549367a15e Fix error check in tryLaunchTask. 2016-09-07 09:46:59 +02:00
Michael Hackstein 8ba5472768 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-07 09:11:43 +02:00
jsteemann f5a595f464 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:07 +02:00
Michael Hackstein 4f50911c88 Fixed a bug in Traversal Explainer. Also fixed undefined behaviour when directly checking for an attribute omitting == true in early traversal filter. 2016-09-06 18:46:40 +02:00
Andreas Streichardt ecc571b299 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-06 17:13:40 +02:00
Kaveh Vahedipour a9ce21c80e minor 2016-09-06 16:52:03 +02:00
Andreas Streichardt 7b4a383877 Fix resilience tests 2016-09-06 16:49:54 +02:00
Andreas Streichardt 6396ac4dc7 Implement removeServer job 2016-09-06 16:49:25 +02:00
Max Neunhoeffer c83c5200cf Fix behaviour of tryLaunchJob when database is dropped. 2016-09-06 16:29:52 +02:00
Max Neunhoeffer 6adc95ddce Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-06 14:59:42 +02:00
jsteemann b718f67ff6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 14:40:51 +02:00
Max Neunhoeffer c083693ef0 Better error reporting in tryLaunchTask. 2016-09-06 14:28:00 +02:00
Kaveh Vahedipour 64887d6a86 agency tests wait for leadership to be established 2016-09-06 14:10:54 +02:00
jsteemann 5c9d015a28 fixed some explainer errors 2016-09-06 13:27:04 +02:00
jsteemann 6ddf8bab54 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 11:22:14 +02:00
jsteemann 6ad39e26d6 jslint 2016-09-06 11:12:22 +02:00
jsteemann b161f5b9aa test adjustments 2016-09-06 11:10:17 +02:00
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +02:00
Kaveh Vahedipour 3086b45178 agency tests for replace/erase in kv-store 2016-09-06 09:25:25 +02:00
Kaveh Vahedipour 9941c74b9d inaccuracies in timing may yield wrong results in agency tests for ttls 2016-09-06 08:56:14 +02:00
Kaveh Vahedipour 51b6888549 new agency operators REPLACE and ERASE 2016-09-05 18:08:23 +02:00
Jan Steemann af149e8b7b fix deletion of users/permissions 2016-09-05 15:13:08 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
jsteemann 4492409d5f Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-02 15:23:15 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Wilfried Goesgens 6dd57a6c4c Add instance info & port sniffing template 2016-09-02 14:18:02 +02:00
Wilfried Goesgens 081e419c68 Make failures output last, so if one scrolls up from the end of the run they occur first. 2016-09-02 11:55:07 +02:00
jsteemann 6c2bb5513e Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 16:06:22 +02:00
jsteemann a859a371ea Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 16:03:27 +02:00
jsteemann 0a2079e97e jslint 2016-09-01 16:03:11 +02:00
jsteemann ae2b1072cd Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 16:01:19 +02:00
Frank Celler 04a82b919f added --cluster.system-replication-factor 2016-09-01 15:59:02 +02:00
Wilfried Goesgens 892aaa3eb2 Analyse the system core pattern if we're on linux. 2016-09-01 15:45:06 +02:00
jsteemann 3ac79c8132 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 15:08:42 +02:00
Wilfried Goesgens 549e7b46d7 mention that the edge is invalid, because of it doesn't obey the edge definitions. 2016-09-01 14:39:38 +02:00
Kaveh Vahedipour 6239a5fbc5 minor reorganisation 2016-09-01 13:45:15 +02:00
jsteemann fb04340937 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 10:47:44 +02:00
jsteemann 2eaf7196e2 fixed some tests 2016-09-01 09:41:11 +02:00
jsteemann 26101187e8 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:59 +02:00
Michael Hackstein 513f6ce560 Now all AGENTs do re port that they are not part of a cluster. This did confuse the statistics.js 2016-08-31 17:20:28 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +02:00
Kaveh Vahedipour 676e5b1329 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-31 08:34:21 +00:00
jsteemann b2eadbd179 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:50 +02:00
Wilfried Goesgens 1c34b564ed Fix release matching for alpha/beta versions 2016-08-30 14:39:48 +02:00
jsteemann bd590fb62d Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 08:18:34 +02:00
Kaveh Vahedipour c53428ce89 minor fixes 2016-08-29 17:13:33 +02:00
Kaveh Vahedipour b94f17fb21 minor timing 2016-08-26 15:30:26 +00:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
jsteemann 999e2dab1b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 15:38:12 +02:00
Jan Steemann 9436b411db fixed tests 2016-08-25 14:40:54 +02:00
Jan Steemann 3600ed40f8 more diagnostic output 2016-08-25 14:02:47 +02:00
jsteemann 396ab41736 allow dropping system collections in some rare cases 2016-08-25 12:47:06 +02:00
jsteemann 7eaddf5ed5 dont print during test execution 2016-08-24 18:01:07 +02:00
jsteemann 0b6815ef77 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 17:48:29 +02:00
Wilfried Goesgens 795daeea13 Fix agency test. 2016-08-24 17:47:20 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +02:00
Wilfried Goesgens d0300704fb Fix DFDB-Test: create the database directory we run it on. 2016-08-24 17:24:35 +02:00
hkernbach 1d3fadba22 grunt build 2016-08-24 16:38:07 +02:00
hkernbach 2be5c2b15c gv improved usability 2016-08-24 16:33:09 +02:00
hkernbach 79d7a5ed39 gv improvements 2016-08-24 15:16:39 +02:00
root c7f8046e48 raft bug. leader ship cannot be rendered to higher term and lower index. 2016-08-24 09:26:34 +00:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00