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

CHANGELOG

@@ -47,7 +47,6 @@ v2.3.0 (XXXX-XX-XX)
 
       arangod --server.disable-authentication true --server.endpoint tcp://127.0.0.1:8529 data
 
-
 * improved performance of CSV import in arangoimp
 
 * fixed issue #1027: Stack traces are off-by-one

CMakeLists.txt

@@ -433,7 +433,9 @@ if (MSVC)
 
   add_definitions("-DU_STATIC_IMPLEMENTATION=1")
 elseif (BUILD_PACKAGE STREQUAL "raspbian")
-  set(ICU_LIBS icui18n;icuuc;icudata;pthread;m CACHE path "ICU libraries")
+  set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty-ARM/icu/include CACHE path "ICU include path")
+  set(ICU_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty-ARM/icu/lib CACHE path "ICU library path")
+  set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries")
   set(ICU_VERSION "52.1" CACHE string "ICU version")
 else ()
   set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/icu/BUILD/include CACHE path "ICU include path")

GNUmakefile

@@ -186,12 +186,15 @@ pack-arm:
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--disable-all-in-one-icu \
-		--disable-all-in-one-v8 \
+		--enable-all-in-one-icu \
+		--enable-all-in-one-v8 \
 		--enable-all-in-one-libev \
 		--with-v8=./3rdParty-ARM \
 		--disable-mruby
 
+	touch .icu-build-32
+	touch .v8-build-32
+
 	${MAKE} pack-arm-cmake
 
 pack-arm-cmake:

js/server/server.js

@@ -66,7 +66,7 @@
   internal.loadStartup("server/bootstrap/routing.js").startup();
 
   // start the queue manager once
-  if (internal.enableStatistics && internal.threadNumber === 0) {
+  if (internal.threadNumber === 0) {
     require('org/arangodb/foxx/queues/manager').run();
   }