inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,227 Commits 330 Branches 2,178 Tags
839451b3a7a32c7eb98c79ef5af82ddc0742a24c
Commit Graph

4227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Leahu
3319b6469f Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127458


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-01 13:29:36 +00:00
Raluca Munteanu
a94b7c3f02 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127375


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-25 14:42:00 +00:00
Raluca Munteanu
e63e2e6a09 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127305,127306,127355


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:50:43 +00:00
Raluca Munteanu
4aa15a7a30 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127296


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:38:04 +00:00
Cristian Turlica
3cc104e553 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127277,127278


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-20 13:24:24 +00:00
Cristian Turlica
c84d6ca771 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127260


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-20 13:18:34 +00:00
Jean-Pierre Huynh
89691f5370 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127274 jphuynh: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 15:40:43 +00:00
Jean-Pierre Huynh
9469c60054 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 15:40:04 +00:00
Andrei Rebegea
529bd49464 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127225,127234,127236


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 14:57:21 +00:00
Andrei Rebegea
650dafe018 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127216


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 14:54:58 +00:00
Andrei Rebegea
aa5260d711 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127179,127187


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 14:29:03 +00:00
Andrei Rebegea
231967da7c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127171


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 14:25:48 +00:00
Jean-Pierre Huynh
bd07ff387a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127199 jphuynh: BDE-674: Fix conflict tags.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:48:52 +00:00
Jean-Pierre Huynh
06f78b84d3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:48:38 +00:00
Jean-Pierre Huynh
1931851a1d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:48:38 +00:00
Jean-Pierre Huynh
c1cc0d0ee8 BDE-674: Fix conflict tags. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:47:35 +00:00
Jean-Pierre Huynh
3c81cdfd0c BDE-674: Fix conflict tags. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:47:35 +00:00
Jean-Pierre Huynh
768f0f4bb3 BDE-674: Fix conflict tags. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:47:35 +00:00
Jean-Pierre Huynh
749f0f61df Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127192 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:39:02 +00:00
Jean-Pierre Huynh
1f30ab0b13 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 125527


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:37:10 +00:00
Jean-Pierre Huynh
45c68e396b BDE-674: Pull Manager from Nexus instead of BINARIES. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:29:09 +00:00
Jean-Pierre Huynh
879181aac4 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:22:34 +00:00
Jean-Pierre Huynh
cd260074d2 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:22:34 +00:00
Cristian Turlica
0de711de96 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127142,127158


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-17 14:19:00 +00:00
Cristian Turlica
32799a4e57 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127132


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-17 14:15:10 +00:00
Cristian Turlica
40624d7fe9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127085,127102


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-16 14:52:52 +00:00
Cristian Turlica
e9000f0612 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127077


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-16 14:47:38 +00:00
Ramona Neamtu
d3b51d6a4e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127046,127063


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-13 13:34:29 +00:00
Ramona Neamtu
1f265a4c9d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127026


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-13 13:28:10 +00:00
Ancuta Morarasu
a2de2b3975 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126687


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-12 08:49:38 +00:00
Ancuta Morarasu
887d69ddb7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126680


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-12 08:45:28 +00:00
Ancuta Morarasu
8087d4e458 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126679 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
       


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-12 08:45:23 +00:00
Ancuta Morarasu
d7f6480a4b Merged HEAD (5.2) to 5.2.N (5.2.1) 
126634 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125740 jvonka: Merged API-STRIKES-BACK (5.2.0) to FILE-FOLDER-API (5.2.0)
         125736: ALF-21420: cors-filter - bump version (from 1.9.3 to 2.5)
         - ACE-4055


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:41:21 +00:00
Ancuta Morarasu
387291cf76 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126573 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:11:01 +00:00
Ancuta Morarasu
543ec21b5f Merged HEAD (5.2) to 5.2.N (5.2.1) 
126475 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122422 gjames: RA-810: Adding api-explorer to the maven devenv.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:36:49 +00:00
Ancuta Morarasu
856e945c9b Merged HEAD (5.2) to 5.2.N (5.2.1) 
126436 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:19:27 +00:00
Ancuta Morarasu
e182ae19a5 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126409 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121471 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when running repo
      - as per installer & old dev env (=> tomcat7 server.xml
      - this fixes "relativePath" for uri encoding of params (for utf-8 encoded characters in folder/file name)
      RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:10:40 +00:00
Ramona Neamtu
3c660b40a2 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126309,126339


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 09:04:22 +00:00
Ramona Neamtu
a1d1df8aa7 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
    


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 09:03:34 +00:00
Ramona Neamtu
ec0217b25f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126258


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 08:32:38 +00:00
Jamal Kaabi-Mofrad
268417aba2 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
125740 jvonka: Merged API-STRIKES-BACK (5.2.0) to FILE-FOLDER-API (5.2.0)
      125736: ALF-21420: cors-filter - bump version (from 1.9.3 to 2.5)
      - ACE-4055


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 12:10:44 +00:00
Jamal Kaabi-Mofrad
e4fd297c55 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:35:15 +00:00
Jamal Kaabi-Mofrad
f1f4f6ce15 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
122422 gjames: RA-810: Adding api-explorer to the maven devenv.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:07:53 +00:00
Jamal Kaabi-Mofrad
8276954fbc Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:54:46 +00:00
Jamal Kaabi-Mofrad
a702e4e08b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
121471 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when running repo
   - as per installer & old dev env (=> tomcat7 server.xml
   - this fixes "relativePath" for uri encoding of params (for utf-8 encoded characters in folder/file name)
   RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:48:46 +00:00
Alan Davis
4e55ad228c Merged 5.2.N (5.2.1) to HEAD (5.2) 
126146: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126144 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126142 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126140 jphuynh: MNT-16253: ImageMagick
   126147: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126145 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126143 jphuynh: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126141 jphuynh: MNT-16253: ImageMagick
   126316: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126313 adavis: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126287 jphuynh: MNT-16253: ImageMagick


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 15:06:08 +00:00
Alan Davis
93979d171c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126253 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126110 jphuynh: MNT-16202: Fix apostrophes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:57:46 +00:00
Alan Davis
f9508257c6 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126313 adavis: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126287 jphuynh: MNT-16253: Updated policy.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:56:53 +00:00
Alan Davis
d7b2706ef2 MNT-16256: Merged 5.1.N (5.1.2) to 5.1.1 (5.1.1) 
126313 adavis: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126287 jphuynh: MNT-16253: Updated policy.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:54:07 +00:00
Alan Davis
d1aa42c987 MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      126287 jphuynh: MNT-16253: Updated policy.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:49:09 +00:00