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

arangod/GeneralServer/HttpCommTask.cpp

@@ -47,9 +47,9 @@ class HttpResponse;
 namespace rest {
 class GeneralServer;
 
-size_t const HttpCommTask::MaximalHeaderSize = 2 * 1024 * 1024;      //   1 MB
+size_t const HttpCommTask::MaximalHeaderSize = 2 * 1024 * 1024;       //    2 MB
 size_t const HttpCommTask::MaximalBodySize = 1024 * 1024 * 1024;      // 1024 MB
-size_t const HttpCommTask::MaximalPipelineSize = 1024 * 1024 * 1024;  // 512 MB
+size_t const HttpCommTask::MaximalPipelineSize = 1024 * 1024 * 1024;  // 1024 MB
 size_t const HttpCommTask::RunCompactEvery = 500;
 
 HttpCommTask::HttpCommTask(GeneralServer* server, TRI_socket_t sock,

lib/SimpleHttpClient/SimpleHttpResult.cpp

@@ -162,7 +162,7 @@ void SimpleHttpResult::addHeaderField(char const* key, size_t keyLength,
 
           if (_returnCode == 204) {
             // HTTP 204 = No content. Assume we will have a content-length of 0.
-            // note that will value can be overridden later if the response has the content-length
+            // note that the value can be overridden later if the response has the content-length
             // header set to some other value
             setContentLength(0);
           }

scripts/startLocalCluster.sh

@@ -96,6 +96,7 @@ start() {
     PORT=$2
     mkdir cluster/data$PORT
     echo Starting $TYPE on port $PORT
+    mkdir -p cluster/apps$PORT 
     build/bin/arangod -c none \
                 --database.directory cluster/data$PORT \
                 --cluster.agency-endpoint tcp://127.0.0.1:$BASE \