From d30200dbb0e26d174da9038258a870bcd3d3bcb3 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 7 Feb 2017 13:52:07 +0000 Subject: [PATCH] Fixed distro files git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution@142332 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/LICENSE | 6 +----- distro/MAINTAINERS | 10 ++++++---- distro/changelog.xml | 9 +++++++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/distro/LICENSE b/distro/LICENSE index 07f22ed..cdf50bd 100644 --- a/distro/LICENSE +++ b/distro/LICENSE @@ -1,8 +1,4 @@ gCube System - License ------------------------------------------------------------ -The gCube/gCore software is licensed as Free Open Source software conveying to -the EUPL (http://ec.europa.eu/idabc/eupl). -The software and documentation is provided by its authors/distributors "as is" -and no expressed or implied warranty is given for its use, quality or fitness -for a particular case. \ No newline at end of file +${gcube.license} \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS index ea0641f..9842a38 100644 --- a/distro/MAINTAINERS +++ b/distro/MAINTAINERS @@ -1,4 +1,6 @@ -* Fabio Simeoni (fabio.simeoni@fao.org), FAO of the UN, Italy -* Andrea Manzi (andrea.manzi@cern.ch), CERN, Switzerland -* Luca Frosini (luca.frosini@isti.cnr.it), ISTI -CNR, Italy -* Lucio Lelii (lucio.lelii@isti.cnr.it), ISTI -CNR, Italy \ No newline at end of file +- Luca Frosini (luca.frosini-AT-isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, + Pisa (Italy); +- Lucio Lelii (lucio.lelii@isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, + Pisa (Italy). \ No newline at end of file diff --git a/distro/changelog.xml b/distro/changelog.xml index b712893..5ffe235 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,8 +1,13 @@ + + - + + Fixed distro files + + Added new Authorization Mechanism based on token - + smartgears-distribution 1.2.6: set default log level to WARN (refs #2145) smartgears-distribution 1.2.6: distribution field on monitor is missing when a smartgears node is upgraded (refs #1268)