From 2cfcd2cd4e49e434bebd9240589cda28085f5a97 Mon Sep 17 00:00:00 2001
From: rwerquin <rwerquin@merethis.com>
Date: Tue, 26 May 2015 15:36:02 +0200
Subject: [PATCH] update changelog + add release notes

---
 CHANGELOG                               | 24 +++++++++++++++
 doc/en/release_notes/centreon-2.6.1.rst | 39 +++++++++++++++++++++++++
 doc/fr/release_notes/centreon-2.6.1.rst | 39 +++++++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 doc/en/release_notes/centreon-2.6.1.rst
 create mode 100644 doc/fr/release_notes/centreon-2.6.1.rst

diff --git a/CHANGELOG b/CHANGELOG
index 6a6d8ebc8c..470568fffa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,27 @@
+## Centreon 2.6.1
+
+Bug fixes
+=========
+#5655: Changing Host Templates doesn't delete services
+#5925: Popup Dialogs (Acknowledge, Downtimes etc.) not working with Internet Explorer
+#6224: Special characters in LDAP are replaced by underscore
+#6358: It's possible to bypass ACLs on Event Logs page
+#6375: servicegroups empty into servicegroups.cfg but ok in DB
+#6377: PHP logs are too much verbose with PHP 5.4
+#6378: PHP logs are too much verbose with PHP 5.3
+#6383: Random severity on services
+#6390: Escalations with contact groups containing space
+#6391: Some traps are skipped
+#6396: Warning and critical threshold display in centreon graph
+#6399: Wrong condition in centreonLDAP.class.php
+#6410: Do not limit to 20 the number of trap rules or macro in host and services config pages
+
+Features
+========
+#6035: Removing Centreon Broker local module
+#6366: New option for Centreon Engine log
+#6392: Block choice of Nagios and NDO in installation processus
+
 ## Centreon 2.6.0
 
 Bug fixes
diff --git a/doc/en/release_notes/centreon-2.6.1.rst b/doc/en/release_notes/centreon-2.6.1.rst
new file mode 100644
index 0000000000..d29711e21f
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.6.1.rst
@@ -0,0 +1,39 @@
+==============
+Centreon 2.6.1
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.6.0, 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
+=========
+
+- #5655: Changing Host Templates doesn't delete services 
+- #5925: Popup Dialogs (Acknowledge, Downtimes etc.) not working with Internet Explorer
+- #6224: Special characters in LDAP are replaced by underscore
+- #6358: It's possible to bypass ACLs on Event Logs page
+- #6375: servicegroups empty into servicegroups.cfg but ok in DB
+- #6377: PHP logs are too much verbose with PHP 5.4
+- #6378: PHP logs are too much verbose with PHP 5.3
+- #6383: Random severity on services
+- #6390: Escalations with contact groups containing space
+- #6391: Some traps are skipped
+- #6396: Warning and critical threshold display in centreon graph
+- #6399: Wrong condition in centreonLDAP.class.php
+- #6410: Do not limit to 20 the number of trap rules or macro in host and services config pages
+
+Features
+========
+
+- #6035: Removing Centreon Broker local module
+- #6366: New option for Centreon Engine log
+- #6392: Block choice of Nagios and NDO in installation processus
diff --git a/doc/fr/release_notes/centreon-2.6.1.rst b/doc/fr/release_notes/centreon-2.6.1.rst
new file mode 100644
index 0000000000..d29711e21f
--- /dev/null
+++ b/doc/fr/release_notes/centreon-2.6.1.rst
@@ -0,0 +1,39 @@
+==============
+Centreon 2.6.1
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.6.0, 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
+=========
+
+- #5655: Changing Host Templates doesn't delete services 
+- #5925: Popup Dialogs (Acknowledge, Downtimes etc.) not working with Internet Explorer
+- #6224: Special characters in LDAP are replaced by underscore
+- #6358: It's possible to bypass ACLs on Event Logs page
+- #6375: servicegroups empty into servicegroups.cfg but ok in DB
+- #6377: PHP logs are too much verbose with PHP 5.4
+- #6378: PHP logs are too much verbose with PHP 5.3
+- #6383: Random severity on services
+- #6390: Escalations with contact groups containing space
+- #6391: Some traps are skipped
+- #6396: Warning and critical threshold display in centreon graph
+- #6399: Wrong condition in centreonLDAP.class.php
+- #6410: Do not limit to 20 the number of trap rules or macro in host and services config pages
+
+Features
+========
+
+- #6035: Removing Centreon Broker local module
+- #6366: New option for Centreon Engine log
+- #6392: Block choice of Nagios and NDO in installation processus
-- 
GitLab