commit dd4b85fcaa634ed829e79e266ee547c0522e71f6
Merge: 9fc1548 fa7de56
Author: Jan Christoph Uhde <[email protected]>
Date:   Thu Jan 10 10:21:26 2019 +0100

    Merge branch 'devel' into feature/cpp17

    * devel:
      upgrade to boost 1.69.0 (#7910)
      Doc - Add a paragraph that JS JS trxs are excluded from intermediate commits. (#7919)
      issue 511.7.3: restore single-document optimization, implement call to update data-store options, add IResearchView upgrade step (#7918)
      improve assertions (#7830)
      fix MSVC warning
      remove unused function
      fix #7900 - null bind values do not change to empty string anymore (#7917)

commit 9fc1548
Merge: f2ecee8 e7810e1
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Jan 9 09:36:19 2019 +0100

    Merge remote-tracking branch 'origin/devel' into feature/cpp17

    * origin/devel:
      Doc - Update remark about per-database replication (#7891)
      Doc - Known Issues - new links (#7908)
      support db._explain with all plans (#7895)
      JWT base64url encoding (#7899)
      cppcheck/Scheduler (#7909)
      multiplex REPLICATION-APPLIER-STATE files for RocksDB engine (#7898)
      fix compile warnings
      upgrade bundled curl library to version 7.63 (#7846)
      Feature/new server infra (#7733)
      Doc - check_function (#7885)
      simran (#7881)
      added AQL function CHECK_DOCUMENT (#7842)
      added arangorestore option `--cleanup-duplicate-attributes` (#7877)
      Doc - arangorestore improvements (#7878)
      added arangorestore options `--number-of-shards` and `--replication-f… (#7869)

commit f2ecee8
Merge: 44adf97 5c53ebc
Author: Jan Christoph Uhde <[email protected]>
Date:   Thu Jan 3 10:51:20 2019 +0100

    Merge remote-tracking branch 'origin/devel' into feature/cpp17

    * origin/devel: (40 commits)
      Feature/jwt keyfile (#7863)
      prevent duplicate attributes being generated by AQL queries (#7837)
      fixed issue #7834 (#7843)
      Bug fix/issues 23122018 (#7847)
      Documents that arangorestore/arangodump threads option is from v3.4.0 on (#7701)
      Update ISSUE_TEMPLATE.md (#7103)
      Doc - Forwardports to devel - 2018-12-27 (#7858)
      Doc - Sync-external-repo-2018-12-25 (#7854)
      Doc - re-add switching storage engine section (#7781)
      Doc - Fix build (whitespaces, triple-backticks, comments) (#7857)
      Add http_server test for creating view with links (#7852)
      big reformat
      added new clang style and reformat script for clang-format 6.0
      Doc - Improve MacOS Installation page (#7744)
      Fix issue with geo iterator reset. (#7839)
      Doc - Single Instance vs. Cluster (diff + migration) (#7739)
      Rdb index background (preliminary) (#7644)
      iResearch asan issue (#7832)
      Feature/improve edgeindex covered (#7718)
      issue 511.6: update iresearch to 6e870904eae5eaf891359ed06e7332666c02cb19 (#7819)
      ...

commit 44adf97
Author: Jan Christoph Uhde <[email protected]>
Date:   Tue Dec 18 13:39:03 2018 +0100

    Add COMPILER_* variables to VERSIONS file.

    The variables will be used to select a fitting compiler in the CI.
    Developers need to ensure themselves that their development environment
    supports the c++ standard.

commit 8124eb3
Merge: 127bb7d 4423125
Author: Jan Christoph Uhde <[email protected]>
Date:   Tue Dec 18 11:09:42 2018 +0100

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

    * 'devel' of https://github.com/arangodb/arangodb: (381 commits)
      tools are now looking into the build to find the file (#7128)
      issue 511.3: remove IResearchViewDBServer and use the IResearchView directly on db-server (#7748)
      Fix S2 for aarch64. (#7770)
      equalising devel and 3.4 in agency/cluster (#7755)
      wording
      startLocalCluster in rr debugging mode cannot be started with --console on agents / db servers (#7776)
      fix cmake parameters coincidence (#7774)
      Fix a rare deadlock situation in Replication sync phase (#7759)
      add virtual dtor
      wait for procdump to exit too. (#7731)
      fix invalid handling of `_lastValue` in case of multiple coordinators (#7734)
      fixed item 3 of issue #7009 (#7747)
      updated 3rdparty licenses
      remove inclusion of valgrind.h
      remove now-unused file
      Bug fix/fix thread shutdown (#7728)
      Doc - fix build by adding missing SUMMARY entries (#7741)
      issue 511.2.1: use references instead of raw pointers for Index operations to avoid null pointer access (#7725)
      port 3.4 change to stopBackgroundThreads.  Move ClusterCommThread routines to same place in source file. (#7721)
      Ignore invaild geo coordinates when indexing. (#7724)
      ...

commit 127bb7d
Author: Jan Christoph Uhde <[email protected]>
Date:   Mon Oct 15 22:06:27 2018 +0200

    fix invoke for c++17

commit 65a514c
Author: Frank Celler <[email protected]>
Date:   Mon Oct 15 18:58:31 2018 +0200

    trying to use 17

commit 8344d96
Merge: 2822dae c7933bc
Author: Frank Celler <[email protected]>
Date:   Mon Oct 15 18:08:52 2018 +0200

    Merge branch 'devel' of ssh://github.com/arangodb/ArangoDB into feature/cpp17

commit 2822dae
Merge: 4001d11 af2f18f
Author: Frank Celler <[email protected]>
Date:   Fri Oct 12 17:44:04 2018 +0200

    Merge branch 'feature/boost-168' of ssh://github.com/arangodb/ArangoDB into feature/cpp17

commit 4001d11
Author: Frank Celler <[email protected]>
Date:   Fri Oct 12 17:43:46 2018 +0200

    fixed merge conflict

commit 94cb4b7
Merge: cbc2f34 d3c4461
Author: Frank Celler <[email protected]>
Date:   Fri Oct 12 14:35:42 2018 +0200

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

commit af2f18f
Author: Jan Christoph Uhde <[email protected]>
Date:   Fri Sep 28 14:44:16 2018 +0200

    add bcrypt.lib to make uuid work

commit 11efd12
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 12:31:25 2018 +0200

    fix boost path for iresearch that is not able to use the provided
    information

commit 57ed116
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 10:24:10 2018 +0200

    add missing boost core includes

commit 5d52b32
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 09:22:43 2018 +0200

    upgrade boost to version 1.68.0

commit cbc2f34
Merge: 3de8d48 1b11426
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 12:08:13 2018 +0200

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

    * 'feature/cpp17' of https://github.com/arangodb/arangodb:
      allow MSVC to user autopointer with c++17
      nightly frontend build
      Remove unused variable check from arangodump. (#6529)
      fixed JavaScript error
      added a reserve call
      Bug fix/simplify things (#6516)
      catch 501 (not implemented) in the query editor (ui) (#6523)
      return error codes in case a babies remove operation fails (#6527)
      Use physical collection directly (#6526)
      Feature/aql item block compression (#6514)
      move tests to the right location
      take over selectivity estimates (#6505)
      Properly check syncer erros, catch more exceptions (#6520)
      prevent out-of-bounds array access
      Fix deduplication in IndexBlock (#6508)

commit 3de8d48
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 12:05:56 2018 +0200

    add autopointer and tr1

commit 1b11426
Merge: 4b38f0a 0dd277d
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 10:06:01 2018 +0200

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

    * 'devel' of https://github.com/arangodb/arangodb:
      nightly frontend build
      Remove unused variable check from arangodump. (#6529)
      fixed JavaScript error
      added a reserve call
      Bug fix/simplify things (#6516)
      catch 501 (not implemented) in the query editor (ui) (#6523)
      return error codes in case a babies remove operation fails (#6527)
      Use physical collection directly (#6526)
      Feature/aql item block compression (#6514)
      move tests to the right location
      take over selectivity estimates (#6505)
      Properly check syncer erros, catch more exceptions (#6520)
      prevent out-of-bounds array access
      Fix deduplication in IndexBlock (#6508)

commit 4b38f0a
Author: Jan Christoph Uhde <[email protected]>
Date:   Wed Sep 19 10:04:46 2018 +0200

    allow MSVC to user autopointer with c++17

commit 9c91023
Merge: 1b9e580 e51359b
Author: Jan Christoph Uhde <[email protected]>
Date:   Mon Sep 17 12:53:03 2018 +0200

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

    * 'devel' of https://github.com/arangodb/arangodb:
      port startup fix
      Bugfix/early out invalid links in view creation (#6502)

commit 1b9e580
Merge: b08bc2e 8bd834b
Author: Jan Christoph Uhde <[email protected]>
Date:   Mon Sep 17 06:38:24 2018 +0200

    Merge remote-tracking branch 'origin/devel' into feature/cpp17

    * origin/devel: (38 commits)
      Maintenance delayed by incomplete hashing maintenance actions (#6448)
      Do not hide indexes (#6507)
      Fix WebUI Login with read-only (#6500)
      Improve use of single shard restriction (#6182)
      make cid values in /_api/replication/logger-follow strings as advertised (#6499)
      less dynamic memory allocations on index operations (#6497)
      Fix several TSan warnings (#6473)
      Copy installation files on startup (#6491)
      nightly frontend build
      fix cluster selectivity estimates (#6488)
      this moves aql::Query* out of the call parameter to any aql::Function (#6485)
      Add advertised endpoints. (#6104)
      nightly frontend build
      fix leak in regex cache (#6480)
      Removing ClusterComm ClientTransactionID (#6294)
      pass variables by const reference
      remove unused variable
      remove unused variable
      fix init-order fiasco with static strings (#6475)
      minor issues (#6471)
      ...

commit b08bc2e
Merge: 03fabcc 2eb3c2d
Author: Jan Christoph Uhde <[email protected]>
Date:   Tue Sep 11 12:46:51 2018 +0200

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

    * 'devel' of https://github.com/arangodb/arangodb:
      temporarily increase log verbosity for replication log topic
      Fix skipSome PR (#6455)
      bump version number to 3.5 (#6454)
      Feature/new devel versioning scheme (#6312)
      Bug fix/aql modify cleanup (#6380)
      Trace skipSome() calls (#6449)
      nightly frontend build
      Fix ArangoSearch authentication update task test (#6453)
      Forward port changelog changes and typo fixes from #6303 (#6409)
      fix some issues with sorted variant of COLLECT (#6433)
      added tests, updated docu (#6407)
      now that we are on c++14 and std::make_unique is available everywhere, we can safely remove our shim for std::make_unique (#6429)
      Fixed memory leak due to cyclic references of shared pointer. (#6442)
      do not create empty useless transaction data objects (#6430)
      add some debugging for unstable replication_sync test (#6436)
      Address leak sanitizer warnings (#6275)
      Fix Pregel Graph Loading Logic (#6419)
      remove unused variables
      fix profile output for nodes without calls to getSome (#6397)

commit 03fabcc
Author: Jan Christoph Uhde <[email protected]>
Date:   Tue Sep 11 07:19:21 2018 +0200

    switch more libs to c++17

commit 3359420
Author: Jan Christoph Uhde <[email protected]>
Date:   Mon Sep 10 07:31:49 2018 +0200

    fix static asserts in iresearch

commit 90eab95
Author: Jan Christoph Uhde <[email protected]>
Date:   Mon Sep 10 07:10:48 2018 +0200

    move from c++14 to c++17

* origin/devel:
  Doc - Extend generation of program option tables (#7888)
  Bug fix/internal issue #316 (#7911)
  fix openssl 1.3 usage

* origin/devel: (28 commits)
  issue 504.1: post-review changes (#7965)
  issue 504: return Result instead of int from all ClusterInfo functions (#7954)
  Doc - Upgrade on Windows (#7682)
  Doc - Single Instance vs. Cluster (update) (#7960)
  Fix stream cursor bug (#7956)
  Added collectAll, updated fuerte (#7949)
  UI: Add Drivers & Integrations column + fix links for 3.4 (#6695)
  Doc - updates to the compiling under windows section (#7894)
  Doc - rel notes page imp (#7613)
  Doc - fixes link
  Doc - upgraded starter procedure
  willi (#7948)
  New customer login url (#7870)
  Foxx queue jobs hanging after Foxxmaster crash (#7922)
  issue 511.9.1: track DataSource instance instead of only its name in QueryCache (#7943)
  fix issue #7933: Regression on ISO8601 string compatibility in AQL (#7935)
  speed up containers that contain ExecutionNodes' variables (#7937)
  Doc - Cookbook: Remove outdated OpenSSL recipe (#7929)
  reformat arangosearch sources (#7941)
  issue 511.8: remove a redundant IResearchLinkDrop marker, it does the exact same thing as IndexDrop that is also written to the WAL (#7923)
  ...

* origin/devel:
  updated marked to 0.3.9
  special stunt for arangoimp
  fix typo in docs
  Refactoring index interface (#7971)
  Bug fix/fix catch issues (#7970)
  added "peakMemoryUsage" query result figure (#7952)

* origin/devel: (169 commits)
  where did the % go? (#8342)
  Bug fix/allow creating foxx queues inside transactions (#8339)
  fix an assertion failure when plans are shut down in an invalid state (#8334)
  add option `--console.history` to arangosh (#8327)
  show thread name in fatal error messages
  Doc - Fix typo in GettingStarted/QueryingTheDatabase.md
  fix ASan warnings
  use the specified python interpreter here too (#8330)
  🚨 Fix struct vs class warning (#8329)
  issue 526.1: initial support for vocbase-prefixed analyzer names (#8319)
  expect leader to have disappeared (#8326)
  oversight (#8324)
  issue 520.1.1: decrease link commit interval to 1 second, add workaround for MMFiles not recovering document insertions via WAL (#8313)
  when in activefailover mode detect leader changes, and abort tests since they wouldn't deliver good values anymore (#8306)
  [devel] supervision bug fix backports (#8314)
  added derived files for web UI
  updated documentation
  Doc - Rework AQL Data Types page (#8287)
  fixed typos
  fix test (#8307)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (117 commits)
  use dummyDir for unix socket files (#8220)
  stop after receiving first error message (#8555)
  Fixed sequence point warning in all rows fetcher (#8556)
  Bugfix: Reuse existing manager and monitor (#8494)
  fixed typos, removed unneeded includes (#8547)
  dont whine about --server.jwt-secret if it isn't used (#8546)
  add SingleRemoteModificationExecutor (#8245)
  add ModificationExecutor (#8179)
  Feature/aql sorted collect (#8524)
  eliminate dead store
  Feature/aql gather executors (#8514)
  cppcheck
  address review concerns (#8544)
  Add more El-Cheapo client tests (#8533)
  fix compile warning
  reintroduce smart joins after temporarily reverting them in devel (#8543)
  Suppress false positives about "potential null pointer dereference" (#8501)
  Improved index error messages. (#8532)
  Add RocksDB background error listener. (#8535)
  microoptimizations (#8519)
  ...

* origin/devel:
  don't allocate memory so often in ClusterComm requests (#8550)
  apply unique log ids (#8561)
  Hide in progress indexes (#8564)
  Greylist tests/js/server/replication/replication-fuzz.js (#8557)
  Support Transactions in RestCursorHandler (#8539)
  Feature/subquery by line (#8553)
  thanks @dsonet
  add tests for dump/restore of multiple databases (#8530)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (25 commits)
  add AQL functions CRC32 and FNV64 (#8600)
  added missing fix for NowNanos from upstream RocksDB (#8602)
  updated CHANGELOG
  Bug fix/fixes asan uninitialized by line (#8588)
  don't execute permissions tests (yet)
  [3.4] bug-fix/issue-#8294 (#8430) (#8585)
  revert to old behavior
  Fuse transaction begin request for non baby operations (#8566)
  fix enterprise tests - we mustn't restore smart collections over exising collections (#8581)
  Sort order of databases in the web ui  (#8590)
  Rebuild UI and minor change for PRs 8579, 8583 (#8596)
  Allow replication suite filtering (#8586)
  Bug fix/improve shards ui (#8583)
  Bug fix/custom query names (#8579)
  update rocksdb to 6.0.fb (#8576)
  Doc - Fix headline level of LogLevels.md
  Doc - Backup and Restore - Small typo (#8589)
  blacklist dump_multiple temporarily
  initialize some member variables, added TODOs (#8545)
  rename log id script to match its final purpose (#8578)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (22 commits)
  initialize variable
  add shutdown protection for PregelFeature (#8628)
  improve error message
  Calculation executor v8 performance (#8511)
  fix dumping of agency, disable javascript in agency and dbserver (#8625)
  introduce option `--log.time-format` (#8604)
  Fixed several ASan errors in the catch tests (#8624)
  disambiguate internal exceptions (#8623)
  issue 526.5: add analyzer retrieval functionality (#8592)
  added smart joins
  Bug fix/gharial rm vertex smart fix (#8622)
  acquire mutex when serializing conductor state (#8620)
  Fix handling of index name conflicts during replication. (#8571)
  Remove USE_IRESEARCH definition and usage (#8613)
  fix typo (#8618)
  improve timeout behaviour of test utils (#8614)
  Fix bug in thread creation failure handling. (#8601)
  remove redundant parameter from update API (#8607)
  reintroduce check for vm.overcommit_memory setting (#8603)
  Fix stack-use-after-scope of AqlItemBlockManager (inside SingleRowFetcherHelper) (#8609)
  ...

…the c++ standard

https://meetingcpp.com/blog/items/stdrandom_shuffle-is-deprecated.html

* origin/devel: (172 commits)
  Create a context for the DocumentProducingFunction callbacks (#8852)
  Do less copying in HashedCollect (#8850)
  Feature/aql by line cleanup (#8848)
  Read docs in EnumerateCollection in batches (#8823)
  Foxx Security (#8845)
  Reinclude performance optimization of Return in Subquery (#8844)
  Remove several tests from greylisting
  record the times used for the setup/teardown methods of jsunity tests; exposed to the json report file to be enabled along with the junit xml report files. (#8838)
  Update Starter and Syncer versions to latest
  issue 526.12: store analyzer definitions in a separate entry of the serialized link meta (#8832)
  Added custom initializeCursor implementations for Index and EnumerateCollection (#8828)
  issue 546.1: do not load analyzers in cluster for non-user requests (#8822)
  issue 526.11.1: limit maximum analyzer properties size (#8830)
  Doc - Small typos (#8818)
  Doc - Known Issues - Remove "Fixed in Versions" re AF shutdown hang (#8829)
  Doc - AQL tutorial: Add FOR loop based joins (#8792)
  Fix db object visibility for ArangoSearch tests (#8819)
  K_SHORTEST_PATHS queries only support one variable in FOR (#8784)
  changed to highlight.js
  removed print
  ...

In file included from /Users/jenkins/Git/cpp17/tests/main.cpp:2:
/Users/jenkins/Git/cpp17/3rdParty/catch/catch.hpp:10877:21: error: 'uncaught_exceptions' is unavailable: introduced in macOS 10.12
        return std::uncaught_exceptions() > 0;
                    ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/exception:130:63: note: 'uncaught_exceptions' has been explicitly marked unavailable here
_LIBCPP_FUNC_VIS _LIBCPP_AVAILABILITY_UNCAUGHT_EXCEPTIONS int uncaught_exceptions() _NOEXCEPT;
                                                              ^

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  Improve path finder tests (#8849)
  fix invalid usage of VPackSlice (#8865)
  RocksDB returns certain statistics values as strings. honor that
  fix assertion (#8860)
  compress-data option for arangodump.  ported from 3.4 (#8861)
  fix race in _batchPingTimer shutdown (#8801)
  also fsync underlying directory, otherwise data may not reach disk (#8855)
  escape internal REs (#8857)
  fix misleading instruction in error message (#8820)
  Fix tick overflow (#8840)
  Remove duplicate code (#8825)
  Avoid some exceptions in environment feature when reading files. (#8834)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (92 commits)
  Forward port some changes (#8949)
  Bug fix/fix velocypack error (#8954)
  fix jslint warning
  jslint
  add test for unicode paths (#8909)
  let zip user know why open did not work (#8921)
  honor index hints in optimizer rule (#8940)
  make id a string so all of it can be passed on to V8. (#8933)
  Greylist tests/js/client/shell/shell-foxx-paths-spec.js
  fix compile warnings about unused variables/functions
  upgrade velocypack library (#8926)
  Bug fix/cleanup commtasks (#8893)
  Fix example for kShortestPathsGraph
  Small fix of test setUp
  Fix warning about incompatible types in KShortestPathsFinder (#8936)
  Upgrade Swagger UI (#8912)
  Fix samples generation
  Feature/aql skip some (#8771)
  forwardport changes from 3.4 (#8894)
  fix a rare recovery error, add diagnostic output (#8931)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  added CRYPTO_zalloc
  issue 562.1: represent analyzer properties as object when possible (#8929)
  add missing quote (#8970)
  ArangoSearch sorted indexes (#8888)
  issue 563.1: include static analyzers in analyzer listing (#8925)
  issue 561.1: add pretty-printing to analyzers in JavaScript (#8964)
  fix some issues found by cppcheck (#8959)
  Icu only permits 32bit long strings. (#8953)
  stfu s2 (#8960)
  do not allocate string for _id value temporary (#8961)
  Use ArangoDB Starter 0.14.3 (#8957)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  Fix name of example graph in k Shortest Paths documentation (#8972)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  issue 555.1.1: issue 555.1.1: try loading previous data store snapshots if checkpoint file unavailable, ehnace error message, address some warnings (#8975)
  switch to tiered consolidation by default (#8981)
  as curls multihandle.h defines lets use long here. (#8950)
  fixing issue #7011 (#8967)
  Bug fix/pre compile ui templates (#8958)
  Fix ASAN failure (#8974)
  Bug fix/issue 8841 (#8979)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (31 commits)
  slight wording updates to PR template (#9025)
  add exceptions for tokens function. (#8984)
  fix arangosh tests (#9013)
  remove debug output
  pr template (#9023)
  move stopping more down
  Improve calculation executor performance (#8851)
  Additional AQL skipSome tests for IndexExecutor (#8938)
  add debugging for CommTasks creation & destruction
  bug-fix/arangosearch-upgrade (#9010)
  fix failing test (#9006)
  we now support umlaut temp dirs; create multi-layer temp-dirs; add tests (#9008)
  fix asan error (#9005)
  Bug fix/cleanup system includes (#8962)
  fix sort order in distributed RETURN DISTINCT (#8935)
  fix jslint
  Greylist tests/js/server/recovery/write-throttling-mmfiles.js
  Doc - Feature/swagger operation ids (#8945)
  switch the temp path too (#9000)
  Let only on shard per collection, not per DBServer, be responsible for initialize cursor (and shutdown) (#8946)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (67 commits)
  port Pregel segmented buffers (#9112)
  Add /Z7 switch to V8 gyp (#9127)
  Add USE_CLCACHE_MODE to have specific build options (#9119)
  Feature/rocksdb 6.2 (#9095)
  Bug fix/issues 27052019 (#9117)
  Bug fix/jobs indexes (#9107)
  add std:: (#9115)
  Bug fix/fix syncer download (#9113)
  Added missing initialization; use alignas instead of padding; mark move constructor noexcept (#9111)
  Bug fix/internal issue #572 (#9110)
  Bugfix of DFS path uniqueness implementation (#9041)
  Added filtering analyzers before adding them to view link   - duplica… (#9094)
  Fix two nondeterministically failing cache tests. (#9101)
  try to fix a race in TTL thread shutdown (#9096)
  Update index.html (#9097)
  updated ArangoDB Starter 0.14.4
  only execute requests directly if there is one client on the IoContext (#9090)
  fixed logger view ejs templates (#9092)
  Bug fix/greylist timecritical and nondeterministic (#9047)
  exclude VST requests from direct execution (#9075)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (71 commits)
  backport bug-fix (#9255)
  Bug fix/gravatar ui fix (#9211)
  Bug fix/gharial edge from and tos verification (#9177)
  Bug fix/buffer redux (#9229)
  copy logic of 3.4 scheduler that leaves threads available for FAST lane work (#9235)
  Bug fix/internal issue #589 (#9244)
  upgrade Starter 0.14.5
  Add drop-check for index creation in cluster (#9219)
  wait until task is shut down (#9239)
  attempt to remove expired WAL files on agents (#9231)
  Fix two int size mismatches (#9226)
  fix issues (#9236)
  properly downgrade enterprise features when restoring them into a com… (#9161)
  don't make RocksDB startup fail with 0-byte log files (#9208)
  normalize AQL filter conditions, so that attribute accesses are normally placed on the left hand side of the condition (#9217)
  remove some containers from common.h (#9223)
  Fix shutdown deadlock regarding comm tasks (#9204)
  Revert "Fix Buffer methods (#9070)"
  display reason for error in background listener, plus ignore shutdown (#9206)
  don't include the Logger in header files if it's not necessary (#9216)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  Revert change to shared_ptr in ClusterInfo. (#9256)
  this out of scope inside the callback function (#9169)
  Move roundCost function to utilities (#9247)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (125 commits)
  Add updated JS deps to changelog (#8773)
  Add hot_backup to testing black list.
  Revert macOS package naming (#9469)
  BugFix:  Some error results have messages that are not reporting (#9454)
  bumped to 3.6
  bug-fix/fix-arangosearch-recovery-mmfiles (#9448)
  fix 6561f21 - only abort on timeout, not regular exit failures (#9434)
  Enabled and fixed disabled tests in ArangoSearch (#9450)
  Bug fix/replication fast lane (#9373)
  fix location - while they work with the server these tests are run in arangosh so they need to be in client/ (#9435)
  Fix wrong ars test failure suppression
  remove bogus warnings about statistics thread (#9446)
  bug-fix/internal-issue-#595 (#9440)
  Temporarily suppress failure (#9443)
  Bug fix/internal issue #524 (#9436)
  Fix recovery tmp dir
  Bug fix/fix snippet responsibility for views (#9416)
  remove debug output
  refactoring (#9411)
  Bug fix/internal issue #414 (#9428)
  ...

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb: (70 commits)
  Upgrade arangosync 0.6.5
  slightly changed wording
  Bug fix/fix swagger datatype (#9045)
  Fix ArangoSearch view creation errors (#9600)
  fix runInArangosh result evaluation (#9588)
  Add missing shared_from_this (#9594)
  emit a bit more context when certain failure occurs next time
  try to fix mmfiles test
  add missing includes
  Bug fix/fix replication failures (#9592)
  stop optimization for nested collects (#9484)
  don't keep the memory stats in the collections to save disk space (#9581)
  remove an optimization that is none (#9578)
  Feature/add js isolate mem statistics (#9567)
  added missing function db._transactions(), and equivalent REST API route GET /_api/transaction (#9571)
  fix test result handling of tests running in own spawned arangosh (#9576)
  Feature: Add gzip and encryption to import/export (#9560)
  Fix MACOSX_DEPLOYMENT_TARGET absence case (#9574)
  fixed a bug in RTRIM implementation, fixed issue #9558 (#9562)
  ascii art (#9565)
  ...

* origin/devel: (31 commits)
  bug-fix/internal-issue-#591 (#9639)
  miscellaneous adjustments to pacify cppcheck (#9677)
  Bug fix/simon 19 08 07 (#9655)
  add a way to output the version in the tests (#9673)
  removed unused variable
  hide MMFiles-specific information when we don't need it (#9667)
  remove unused instance variable (#9662)
  Add missing includes for Windows builds. (#9657)
  Set jsunity output to gtest style (#9646)
  add the ability to have cluster special examples (#9613)
  Create TakeoverShardLeader job. (#9653)
  Aardvark: Add k Shortest Paths example graph to UI (#9491)
  [devel] Resign Leadership (#9427)
  get rid of _resolvedNames and _nameLock (#9649)
  Add constructors to fix cppcheck warnings. (#9648)
  Bug fix/optimizations 06 08 2019 (#9641)
  fix compile error
  Decentralize includes (#9623)
  add error to failure (#9637)
  Fast Controlled Leaderchange (#9608)
  ...

* Revert "Revert "Remove emplace hack that was introduced for OSX""

This reverts commit 7df9edd.

* fixed MACOSX_DEPLOYMENT_TARGET

* Fix quotes usage in conditions

* Added MACOS_MIN

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  Bug fix/eslint proper settings (#10251)
  A mixed bag of goods (#10220)
  add the ability to force the traffic from/to the server to be json, for better sniffeability (#10239)
  disallow subqueries in AQL traversal PRUNE conditions (#10232)

…ture/cpp17

* 'devel' of https://github.com/arangodb/arangodb:
  Bug fix/internal issue #627 (#10233)

…ture/cpp17