From aebd5c80d9c705d28dab3226bb0091c1a6640bcf Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Sep 2016 22:07:36 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130274 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1) 130011 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1) 129765 sglover: Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N https://issues.alfresco.com/jira/browse/MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update" git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/rest/api/Nodes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/rest/api/Nodes.java b/source/java/org/alfresco/rest/api/Nodes.java index 46ee98ef89..8a367b4c8f 100644 --- a/source/java/org/alfresco/rest/api/Nodes.java +++ b/source/java/org/alfresco/rest/api/Nodes.java @@ -254,7 +254,7 @@ public interface Nodes * @return */ Node lock(String nodeId, LockInfo lockInfo, Parameters parameters); - + /** * Unlock a node * @param nodeId