8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into cur… · cloud-coders/arangodb@9882cdb · GitHub
[go: up one dir, main page]
Skip to content

Commit 9882cdb

Browse files
author
Jan Steemann
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring
Conflicts: arangod/Aql/ExecutionBlock.cpp lib/HttpServer/HttpHandler.cpp lib/HttpServer/HttpServerJob.h
2 parents 251b1d7 + 9fdce37 commit 9882cdb

File tree

96 files changed

+5757
-6142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+5757
-6142
lines changed

‎CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
v2.6.0 (XXXX-XX-XX)
22
-------------------
33

4+
* added support for HTTP push aka chunked encoding
5+
46
* issue #1051: add info whether server is running in service or user mode?
57

68
This will add a "mode" attribute to the result of the result of HTTP GET `/_api/version?details=true`

0 commit comments

Comments
 (0)
0