From 244e0cd7eb9f46f954dcfed51b3d033a8f26abad Mon Sep 17 00:00:00 2001
From: rwerquin <rwerquin@merethis.com>
Date: Mon, 23 Feb 2015 15:07:31 +0100
Subject: [PATCH] add changelog, release notes
---
CHANGELOG | 13 ++++++++++++
doc/en/installation/from_sources.rst | 4 ++--
doc/en/release_notes/centreon-2.6.0.rst | 27 +++++++++++++++++++++++++
doc/fr/installation/from_sources.rst | 4 ++--
doc/fr/release_notes/centreon-2.6.0.rst | 27 +++++++++++++++++++++++++
5 files changed, 71 insertions(+), 4 deletions(-)
create mode 100644 doc/en/release_notes/centreon-2.6.0.rst
create mode 100644 doc/fr/release_notes/centreon-2.6.0.rst
diff --git a/CHANGELOG b/CHANGELOG
index 51d6ea9cb1..6a6d8ebc8c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+## Centreon 2.6.0
+
+Bug fixes
+=========
+#3239: PHP-5.4 Compatibility
+#5795: ACL and configuration modification with admin users
+
+Features
+========
+#5334, #6114, #6120 : Optimisation and customization on centreontrapd
+#5952: Add possibility to rebuild partially Events informations
+#6160: New Centreon logo
+
## Centreon 2.5.4
Bug fixes
diff --git a/doc/en/installation/from_sources.rst b/doc/en/installation/from_sources.rst
index 96d5e96045..7eede3cbfe 100644
--- a/doc/en/installation/from_sources.rst
+++ b/doc/en/installation/from_sources.rst
@@ -48,7 +48,7 @@ You can now install the necessary prerequisites::
$ yum update
$ yum upgrade
- $ yum install httpd gd fontconfig-devel libjpeg-devel libpng-devel gd-devel perl-GD \
+ $ yum install httpd gd fontconfig-devel libjpeg-devel libpng-devel gd-devel perl-GD perl-DateTime \
openssl-devel perl-DBD-MySQL mysql-server mysql-devel php php-mysql php-gd php-ldap php-xml php-mbstring \
perl-Config-IniFiles perl-DBI perl-DBD-MySQL rrdtool perl-rrdtool perl-Crypt-DES perl-Digest-SHA1 \
perl-Digest-HMAC net-snmp-utils perl-Socket6 perl-IO-Socket-INET6 net-snmp net-snmp-libs php-snmp \
@@ -77,7 +77,7 @@ Debian / Ubuntu
Install the following prerequisites::
- $ apt-get install sudo tofrodos bsd-mailx lsb-release mysql-server libmysqlclient15-dev \
+ $ apt-get install sudo tofrodos bsd-mailx lsb-release mysql-server libmysqlclient15-dev libdatetime-perl \
apache2 apache2-mpm-prefork php5 php5-mysql php-pear php5-ldap php5-snmp php5-gd php5-sqlite \
rrdtool librrds-perl libconfig-inifiles-perl libcrypt-des-perl libdigest-hmac-perl \
libdigest-sha1-perl libgd-gd2-perl snmp snmpd libnet-snmp-perl libsnmp-perl
diff --git a/doc/en/release_notes/centreon-2.6.0.rst b/doc/en/release_notes/centreon-2.6.0.rst
new file mode 100644
index 0000000000..1ef32af6a9
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.6.0.rst
@@ -0,0 +1,27 @@
+==============
+Centreon 2.6.0
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.5.4, make sure to go through all the release notes available
+`here <http://documentation.centreon.com/docs/centreon/en/latest/release_notes/index.html>`_.
+
+*********
+CHANGELOG
+*********
+
+Bug fixes
+=========
+
+- #3239: PHP-5.4 Compatibility
+- #5795: ACL and configuration modification with admin users
+
+Features
+========
+
+- #5334, #6114, #6120 : Optimisation and customization on centreontrapd
+- #5952: Add possibility to rebuild partially Events informations
+- #6160: New Centreon logo
diff --git a/doc/fr/installation/from_sources.rst b/doc/fr/installation/from_sources.rst
index 4b35e8da58..9801a448f1 100644
--- a/doc/fr/installation/from_sources.rst
+++ b/doc/fr/installation/from_sources.rst
@@ -53,7 +53,7 @@ Vous pouvez maintenant installer les dépendances nécessaires :
$ yum update
$ yum upgrade
- $ yum install httpd gd fontconfig-devel libjpeg-devel libpng-devel gd-devel perl-GD \
+ $ yum install httpd gd fontconfig-devel libjpeg-devel libpng-devel gd-devel perl-GD perl-DateTime \
openssl-devel perl-DBD-MySQL mysql-server mysql-devel php php-mysql php-gd php-ldap php-xml php-mbstring \
perl-Config-IniFiles perl-DBI perl-DBD-MySQL rrdtool perl-rrdtool perl-Crypt-DES perl-Digest-SHA1 \
perl-Digest-HMAC net-snmp-utils perl-Socket6 perl-IO-Socket-INET6 net-snmp net-snmp-libs php-snmp \
@@ -86,7 +86,7 @@ Installez les dépendances nécessaires :
::
- $ apt-get install sudo tofrodos bsd-mailx lsb-release mysql-server libmysqlclient15-dev \
+ $ apt-get install sudo tofrodos bsd-mailx lsb-release mysql-server libmysqlclient15-dev libdatetime-perl \
apache2 apache2-mpm-prefork php5 php5-mysql php-pear php5-ldap php5-snmp php5-gd php5-sqlite \
rrdtool librrds-perl libconfig-inifiles-perl libcrypt-des-perl libdigest-hmac-perl \
libdigest-sha1-perl libgd-gd2-perl snmp snmpd libnet-snmp-perl libsnmp-perl
diff --git a/doc/fr/release_notes/centreon-2.6.0.rst b/doc/fr/release_notes/centreon-2.6.0.rst
new file mode 100644
index 0000000000..1ef32af6a9
--- /dev/null
+++ b/doc/fr/release_notes/centreon-2.6.0.rst
@@ -0,0 +1,27 @@
+==============
+Centreon 2.6.0
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.5.4, make sure to go through all the release notes available
+`here <http://documentation.centreon.com/docs/centreon/en/latest/release_notes/index.html>`_.
+
+*********
+CHANGELOG
+*********
+
+Bug fixes
+=========
+
+- #3239: PHP-5.4 Compatibility
+- #5795: ACL and configuration modification with admin users
+
+Features
+========
+
+- #5334, #6114, #6120 : Optimisation and customization on centreontrapd
+- #5952: Add possibility to rebuild partially Events informations
+- #6160: New Centreon logo
--
GitLab