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

jsteemann · jsteemann · commit 3b70cbf6c56e · 2016-09-01T15:25:44.000+02:00
diff --git a/js/common/modules/@arangodb/general-graph.js b/js/common/modules/@arangodb/general-graph.js
@@ -667,7 +667,8 @@ var bindEdgeCollections = function (self, edgeCollections) {
               var err = new ArangoError();
               err.errorNum = arangodb.errors.ERROR_GRAPH_INVALID_EDGE.code;
               err.errorMessage =
-                arangodb.errors.ERROR_GRAPH_INVALID_EDGE.message + ' between ' + from + ' and ' + to + '.';
+                arangodb.errors.ERROR_GRAPH_INVALID_EDGE.message +
+                ' between ' + from + ' and ' + to + '. Doesn\'t conform to any edge definition';
               throw err;
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,8 @@ var bindEdgeCollections = function (self, edgeCollections) {`
`667`	`667`	`var err = new ArangoError();`
`668`	`668`	`err.errorNum = arangodb.errors.ERROR_GRAPH_INVALID_EDGE.code;`
`669`	`669`	`err.errorMessage =`
`670`		`- arangodb.errors.ERROR_GRAPH_INVALID_EDGE.message + ' between ' + from + ' and ' + to + '.';`
	`670`	`+ arangodb.errors.ERROR_GRAPH_INVALID_EDGE.message +`
	`671`	`+ ' between ' + from + ' and ' + to + '. Doesn\'t conform to any edge definition';`
`671`	`672`	`throw err;`
`672`	`673`	`}`
`673`	`674`	`}`