2 Commits

Author SHA1 Message Date
Derek Hulley
a046d9be3f Fixed possible wait(0) in test
- wait((long)(rand.nextDouble() * 1000.0));   // Can result in wait(0)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-01 14:42:18 +00:00
Derek Hulley
d2bce74f0b Merge V1.4 to HEAD
- Ignored Enterprise-specific changes
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 .
   svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-21 23:35:51 +00:00