Alan Davis de8c1e0af5 Merged 5.1.N (5.1.1) to HEAD (5.1) ...

121671 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121619 mrogers: MNT-14860 - Unit test failure in CIFS Content Comparator for PPT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-03-11 21:42:24 +00:00

..

desk

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

rules

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

AlfrescoFolder.java

…

BufferedContentDiskDriver.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

BufferedWrite.java

…

CacheLookupSearchContext.java

Merged V4.1-BUG-FIX to HEAD

2012-09-12 19:10:54 +00:00

CIFSContentComparator.java

Merged 5.1.N (5.1.1) to HEAD (5.1)

2016-03-11 21:42:24 +00:00

CifsHelper.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ClientHelper.java

ALF-16257: CIFS: Collaborator/editor could not edit file on Mac Os Mountain Lion

2013-09-09 12:41:13 +00:00

CommandExecutor.java

…

CommandExecutorImpl.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ContentComparator.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

ContentContext.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

ContentDiskCallback.java

…

ContentDiskDriver2.java

ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP

2015-11-06 14:13:58 +00:00

ContentDiskDriver.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

ContentDiskInterface.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

ContentFileInfo.java

…

ContentIOControlHandler.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ContentNetworkFile.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

ContentQuotaManager.java

Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE)

2015-07-18 08:45:31 +00:00

ContentSearchContext.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

CreateNodeEvent.java

…

DeleteNodeEvent.java

…

DotDotContentSearchContext.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

FilesystemTransactionAdvice.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

InFlightCorrectable.java

…

InFlightCorrector.java

…

InFlightCorrectorImpl.java

…

LegacyFileStateDriver.java

MNT-9050 - When Alfresco is taken out of read-only mode CIFS writes no longer work without restarting fileservers

2013-09-17 11:03:00 +00:00

LinkMemoryNetworkFile.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

LockKeeper.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

LockKeeperImpl.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

LockKeeperRefreshJob.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

LockNodeEvent.java

…

MoveNodeEvent.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

MSOfficeContentNetworkFile.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

NodeEvent.java

…

NodeEventQueue.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

NodeMonitor.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

NodeMonitorFactory.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

NodeRefNetworkFile.java

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

NonTransactionalRuleContentDiskDriver.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

OpenFileMode.java

…

OpenOfficeContentNetworkFile.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

package-info.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

ResultCallback.java

…

TempNetworkFile.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

UserQuotaDetails.java

Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE)

2015-07-18 08:45:31 +00:00