From 47be06295701f06acce27bafbcb9e81df77673b7 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Tue, 25 Apr 2017 18:13:40 +0200
Subject: [PATCH 1/2] move configuring of cmake back into install process - it
 will conflict with the release process otherwise

---
 cmake/InstallMacros.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/InstallMacros.cmake b/cmake/InstallMacros.cmake
index 09a7d20ab4..ed03932e3d 100644
--- a/cmake/InstallMacros.cmake
+++ b/cmake/InstallMacros.cmake
@@ -74,8 +74,9 @@ macro (install_readme input output)
   if (MSVC)
     set(CRLFSTYLE "CRLF")
   endif ()
-  configure_file(${PROJECT_SOURCE_DIR}/${input} "${PROJECT_BINARY_DIR}/${output}" NEWLINE_STYLE ${CRLFSTYLE})
+
   install(
+    CODE "configure_file(${PROJECT_SOURCE_DIR}/${input} \"${PROJECT_BINARY_DIR}/${output}\" NEWLINE_STYLE ${CRLFSTYLE})"
     FILES "${PROJECT_BINARY_DIR}/${output}"
     DESTINATION "${where}"
     )

From 05a46e47813537d05f18032debec48d1f522adc7 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Tue, 25 Apr 2017 19:10:23 +0200
Subject: [PATCH 2/2] fix db._explain() to work with the new interface of the
 graph traverser

---
 js/common/modules/@arangodb/aql/explainer.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/common/modules/@arangodb/aql/explainer.js b/js/common/modules/@arangodb/aql/explainer.js
index 9fefe16678..cd5333ee77 100644
--- a/js/common/modules/@arangodb/aql/explainer.js
+++ b/js/common/modules/@arangodb/aql/explainer.js
@@ -347,8 +347,8 @@ function printTraversalDetails (traversals) {
         maxEdgeCollectionNameStrLen = node.edgeCollectionNameStrLen;
       }
     }
-    if (node.hasOwnProperty('traversalFlags')) {
-      var opts = optify(node.traversalFlags); 
+    if (node.hasOwnProperty('options')) {
+      var opts = optify(node.options); 
       if (opts.length > maxOptionsLen) {
         maxOptionsLen = opts.length;
       }
@@ -384,8 +384,8 @@ function printTraversalDetails (traversals) {
       line += pad(1 + maxEdgeCollectionNameStrLen) + '   ';
     }
 
-    if (traversals[i].hasOwnProperty('traversalFlags')) {
-      line += optify(traversals[i].traversalFlags, true) + pad(1 + maxOptionsLen - optify(traversals[i].traversalFlags, false).length) + '   ';
+    if (traversals[i].hasOwnProperty('options')) {
+      line += optify(traversals[i].options, true) + pad(1 + maxOptionsLen - optify(traversals[i].options, false).length) + '   ';
     } else {
       line += pad(1 + maxOptionsLen) + '   ';
     }
@@ -856,7 +856,7 @@ function processQuery (query, explain) {
         return keyword('FOR') + ' ' + variableName(node.outVariable) + ' ' + keyword('IN') + ' ' + collection(node.collection) + '   ' + annotation('/* ' + (node.reverse ? 'reverse ' : '') + node.index.type + ' index scan */');
 
       case 'TraversalNode':
-        node.minMaxDepth = node.traversalFlags.minDepth + '..' + node.traversalFlags.maxDepth;
+        node.minMaxDepth = node.options.minDepth + '..' + node.options.maxDepth;
         node.minMaxDepthLen = node.minMaxDepth.length;
 
         rc = keyword('FOR ');