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/BRANCHES/DEV/5.2.N/root@130274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:29:04 +00:00
parent 3596c251a8
commit 4f12a98998

View File

@@ -254,7 +254,7 @@ public interface Nodes
* @return
*/
Node lock(String nodeId, LockInfo lockInfo, Parameters parameters);
/**
* Unlock a node
* @param nodeId