Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions

CHANGELOG

@@ -24,9 +24,6 @@ v2.8.0 (XXXX-XX-XX)
 
 v2.7.0 (XXXX-XX-XX)
 -------------------
-* POSTing to org/arangodb/actions/echoRequest now returns 202
-
-* loading modules from collections syntax changed from /db:/module to /db://module
 
 * allow Foxx apps to be installed underneath URL path `/_open/`, so they can be
   (intentionally) accessed without authentication. 

Documentation/Books/Users/ArangoActions/Modifying.mdpp

@@ -72,7 +72,7 @@ To start, we'll define a simple action handler in a module */ownTest*:
     @startDocuBlockInline MOD_01a_routingCreateOwnTest
     @EXAMPLE_ARANGOSH_OUTPUT{MOD_01a_routingCreateOwnTest}
     |db._modules.save({
-    |  path: "/db://ownTest",
+    |  path: "/db:/ownTest",
     |  content:
     |     "exports.do = function(req, res, options, next) {"+
     |     "  res.body = 'test';" +
@@ -342,7 +342,7 @@ Then we send some curl requests to these sample routes:
                "/subdirectory/ourtest/3"];
     for (var i = 0; i < 3; i++) {
       var response = logCurlRequest('GET', url[i]);
-      assert(response.code === 202);
+      assert(response.code === 200);
       logJsonResponse(response);
     }
     db._query("FOR route IN _routing FILTER route.middleware[0].url.match == '/subdirectory/*' REMOVE route in _routing");

Documentation/Books/Users/Installing/Linux.mdpp

@@ -23,21 +23,6 @@ page to use your favorite package manager for the major distributions. After
 setting up the ArangoDB repository you can easily install ArangoDB using yum,
 aptitude, urpmi or zypper.
 
-!SUBSECTION Gentoo
-
-Please use the [portage](https://github.com/mgiken/portage-overlay/tree/master/dev-db/ArangoDB)
-provided by @mgiken.
-
-!SUBSECTION Debian sid
-
-To use ArangoDB on Debian sid (the development version of Debian), a different version
-of ICU is required. User baslr provided the following instructions for getting ArangoDB 2.0.7
-to work on an x86_64:
-
-[link to Github issue](https://github.com/arangodb/arangodb/issues/865)
-
-Other versions of ArangoDB or other architectures should work similarly.
-
 !SUBSECTION Linux-Mint
 
 Please use the corresponding Ubuntu or Debian packages.
@@ -54,4 +39,3 @@ An [Ansible](http://ansible.com) role is available through [Ansible-Galaxy](http
 
 * Role on Ansible-Galaxy: https://galaxy.ansible.com/list#/roles/2344
 * Source on Github: https://github.com/stackmagic/ansible-arangodb
-

js/common/bootstrap/modules.js

@@ -371,9 +371,14 @@ Module._resolveDbModule = function (request) {
   var dbModule = Module._dbCache[request];
   if (!dbModule) {
     dbModule = internal.db._modules.firstExample({path: request});
+    if (!dbModule) {
+      // try again, but prefix module with '/db' as some modules seem
+      // to have been saved with that prefix...
+      dbModule = internal.db._modules.firstExample({path: '/db:' + request});
       if (!dbModule) {
         return null;
       }
+    }
     Module._dbCache[request] = dbModule;
   }
   return dbModule;

js/server/modules/org/arangodb/foxx/service.js

@@ -400,9 +400,6 @@ class FoxxService {
   }
 
   get collectionPrefix() {
-    if (this.isSystem) {
-      return '';
-    }
     return this.mount.substr(1).replace(/[-.:/]/g, '_') + '_';
   }