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

Merge pull request #1178 from yojimbo87/devel 

Add 'mergeObjects' description to edge API docs.
This commit is contained in:
Jan Steemann 2014-12-11 00:59:07 +01:00
parent 0013e56573 953d5efa7a
commit dff7166dbc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/RestHandler/RestEdgeHandler.cpp
View File

@ -627,6 +627,12 @@ bool RestEdgeHandler::createDocumentCoordinator (string const& collname,
/// from the existing edge document that are contained in the patch document with an /// from the existing edge document that are contained in the patch document with an
/// attribute value of *null*. /// attribute value of *null*.
/// ///
/// @RESTQUERYPARAM{mergeObjects,boolean,optional}
/// Controls whether objects (not arrays) will be merged if present in both the
/// existing and the patch edge. If set to *false*, the value in the
/// patch edge will overwrite the existing edge's value. If set to
/// *true*, objects will be merged. The default is *true*.
///
/// @RESTQUERYPARAM{waitForSync,boolean,optional} /// @RESTQUERYPARAM{waitForSync,boolean,optional}
/// Wait until edge document has been synced to disk. /// Wait until edge document has been synced to disk.
/// ///