diff options
Diffstat (limited to 'sugar_network/node/commands.py')
| -rw-r--r-- | sugar_network/node/commands.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sugar_network/node/commands.py b/sugar_network/node/commands.py index 56a3b93..f0226c7 100644 --- a/sugar_network/node/commands.py +++ b/sugar_network/node/commands.py @@ -163,6 +163,12 @@ class MasterCommands(NodeCommands, SyncCommands): NodeCommands.__init__(self, volume) SyncCommands.__init__(self) + @ad.document_command(method='PUT', cmd='merge', + permissions=ad.ACCESS_AUTH) + def merge(self, document, guid, request): + directory = self.volume[document] + directory.merge(guid, request.content) + def _load_pubkey(pubkey): pubkey = pubkey.strip() |