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

130261 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129999 ahind: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
         129643 amorarasu: REPO-164 / REPO-1086 - V1 REST API: Lock Node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:06:41 +00:00
parent 4ab6e72418
commit 51b838e2ef
4 changed files with 42 additions and 41 deletions

View File

@@ -86,6 +86,7 @@ import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.GUID;
import org.alfresco.util.TempFileProvider;
import org.apache.http.HttpStatus;
import org.json.simple.JSONObject;
import org.junit.After;
import org.junit.Before;