inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
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
This commit is contained in:
Alan Davis
2016-09-06 22:07:36 +00:00
parent ca15a2f6fb
commit aebd5c80d9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/Nodes.java
View File

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