Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Max Neunhoeffer 2014-05-12 14:28:13 +02:00
parent c22ea12b1a 4cf29af60a
commit d6373a7f83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -2898,7 +2898,7 @@ void RestReplicationHandler::handleCommandRestoreDataCoordinator () {
const char* key = 0;
TRI_json_t const* doc = 0;
TRI_replication_operation_e type;
TRI_replication_operation_e type = REPLICATION_INVALID;
const size_t n = json->_value._objects._length;

2
js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-collection-common.js
View File

@ -726,7 +726,7 @@ ArangoCollection.prototype.within = function (lat, lon, radius) {
///
/// @EXAMPLES
///
/// To find all documents which contain the terms @LIT{foo} and @LIT{bar}:
/// To find all documents which contain the terms @LIT{text} and @LIT{word}:
///
/// @TINYEXAMPLE{simple-query-fulltext,complete match query}
////////////////////////////////////////////////////////////////////////////////