From 20503ca8b21171c13bc70bce6d2f95bcfdd4d332 Mon Sep 17 00:00:00 2001
From: rwerquin <rwerquin@merethis.com>
Date: Wed, 26 Nov 2014 16:10:25 +0100
Subject: [PATCH] add changelog and release note for 2.5.4

---
 CHANGELOG                               | 17 +++++++++++++++
 doc/en/release_notes/centreon-2.5.4.rst | 29 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 doc/en/release_notes/centreon-2.5.4.rst

diff --git a/CHANGELOG b/CHANGELOG
index ae482aada4..51d6ea9cb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,20 @@
+## Centreon 2.5.4
+
+Bug fixes
+=========
+#5458: Display problem with host groups
+#5924: Generation of service configuration files does not work when "service_inherit_contacts_from_host" is not enabled
+#5926: Centreon-Broker-2.7.x compatibility
+#5929: Fix problem in import service groups by cfg file
+#5942: Fix compatibility with IE
+#5946: Problem in reporting due to acknowledgement
+#5986: Session's Id does not change after logout
+
+Features
+========
+#5433: Argument column larger in service configuration
+#5944: Services inherit criticality from hosts
+
 ## Centreon 2.5.3
 
 Bug fixes
diff --git a/doc/en/release_notes/centreon-2.5.4.rst b/doc/en/release_notes/centreon-2.5.4.rst
new file mode 100644
index 0000000000..c8dbf0c3bc
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.5.4.rst
@@ -0,0 +1,29 @@
+==============
+Centreon 2.5.4
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.5.3, 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
+=========
+#5458: Display problem with host groups
+#5924: Generation of service configuration files does not work when "service_inherit_contacts_from_host" is not enabled
+#5926: Centreon-Broker-2.7.x compatibility
+#5929: Fix problem in import service groups by cfg file
+#5942: Fix compatibility with IE
+#5946: Problem in reporting due to acknowledgement
+#5986: Session's Id does not change after logout
+
+Features
+========
+#5433: Argument column larger in service configuration
+#5944: Services inherit criticality from hosts
-- 
GitLab