Alan Davis 8b4a283ba0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) ...

108046: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107741: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Fix automatic merge error in 107731 - compile fails.


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

2015-07-09 22:13:16 +00:00

..

constraint

Merged BRANCHES\DEV\MODEL_SPLIT to HEAD

2010-06-30 14:17:18 +00:00

types/period

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

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

DictionaryModelType.java

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

2015-07-09 22:12:29 +00:00

DictionaryRepositoryBootstrap.java

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

2015-07-09 22:12:54 +00:00

DictionaryRepositoryBootstrappedEvent.java

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

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

DynamicCreateRepositoryLocation.java

ACE-2237 : Rel38: Upgrade was not completed.

2014-07-30 10:29:37 +00:00

DynamicModelPolicies.java

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

2014-07-23 14:42:53 +00:00

ModelInUseException.java

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

2015-07-09 22:12:29 +00:00

ModelNotInUseException.java

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

2015-07-09 22:12:29 +00:00

ModelValidator.java

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

2015-07-09 22:12:29 +00:00

ModelValidatorImpl.java

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

2015-07-09 22:13:16 +00:00

RepositoryLocation.java

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

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

TestModel.java

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

2014-09-03 12:13:50 +00:00