From 1fbd839f142fff726c8efe86ee258722bce9572c Mon Sep 17 00:00:00 2001
From: rwerquin <rwerquin@merethis.com>
Date: Wed, 21 Oct 2015 13:44:15 +0200
Subject: [PATCH] add CHANGELOG and Release notes for 2.6.5 release

---
 CHANGELOG                               | 10 +++++++++
 doc/en/release_notes/centreon-2.6.2.rst |  4 ++--
 doc/en/release_notes/centreon-2.6.5.rst | 30 +++++++++++++++++++++++++
 doc/fr/release_notes/centreon-2.6.2.rst |  4 ++--
 doc/fr/release_notes/centreon-2.6.5.rst | 30 +++++++++++++++++++++++++
 install.sh                              |  2 +-
 6 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 doc/en/release_notes/centreon-2.6.5.rst
 create mode 100644 doc/fr/release_notes/centreon-2.6.5.rst

diff --git a/CHANGELOG b/CHANGELOG
index 1b3c67871c..bd1868fe27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+## Centreon 2.6.5
+
+#3831: XSS injection in object lists (ZSL-2015-5266)
+#3835: CRSF Issues on Centreon (ZSL-2015-5263)
+#3821: Upgrade from 2.6.1 to 2.6.3 kill Centreon Frontend
+#3826: Split Component and zoom doesn't work
+#3827: Service Group Details page isn't displayed for non admin in Centreon 2.6.3
+#3837: Relation of passive service with SNMP traps problem with multihost link
+#3842: Full logs display on event logs page for a non admin user
+
 ## Centreon 2.6.4
 
 #3793: Porblem when creating an empty hostgroup with non admin user
diff --git a/doc/en/release_notes/centreon-2.6.2.rst b/doc/en/release_notes/centreon-2.6.2.rst
index 17432239c9..8b8a25d8ea 100644
--- a/doc/en/release_notes/centreon-2.6.2.rst
+++ b/doc/en/release_notes/centreon-2.6.2.rst
@@ -22,8 +22,8 @@ Features
 Security fixes
 ==============
 
-- #2979 : Secure the type of media which file can be uploaded
-- Fix some SQL injections
+- #2979 : Secure the type of media which file can be uploaded (ZSL-2015-5264)
+- Fix some SQL injections (ZSL-2015-5265)
 
 Bug fixes
 =========
diff --git a/doc/en/release_notes/centreon-2.6.5.rst b/doc/en/release_notes/centreon-2.6.5.rst
new file mode 100644
index 0000000000..ddfb07d6a2
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.6.5.rst
@@ -0,0 +1,30 @@
+==============
+Centreon 2.6.5
+==============
+
+
+******
+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
+*********
+
+Security fixes
+==============
+
+- #3831: XSS injection in object lists (ZSL-2015-5266)
+- #3835: CRSF Issues on Centreon (ZSL-2015-5263)
+
+Bug fixes
+=========
+
+- #3821: Upgrade from 2.6.1 to 2.6.3 kill Centreon Frontend
+- #3826: Split Component and zoom doesn't work
+- #3827: Service Group Details page isn't displayed for non admin in Centreon 2.6.3
+- #3837: Relation of passive service with SNMP traps problem with multihost link
+- #3842: Full logs display on event logs page for a non admin user
diff --git a/doc/fr/release_notes/centreon-2.6.2.rst b/doc/fr/release_notes/centreon-2.6.2.rst
index 17432239c9..8b8a25d8ea 100644
--- a/doc/fr/release_notes/centreon-2.6.2.rst
+++ b/doc/fr/release_notes/centreon-2.6.2.rst
@@ -22,8 +22,8 @@ Features
 Security fixes
 ==============
 
-- #2979 : Secure the type of media which file can be uploaded
-- Fix some SQL injections
+- #2979 : Secure the type of media which file can be uploaded (ZSL-2015-5264)
+- Fix some SQL injections (ZSL-2015-5265)
 
 Bug fixes
 =========
diff --git a/doc/fr/release_notes/centreon-2.6.5.rst b/doc/fr/release_notes/centreon-2.6.5.rst
new file mode 100644
index 0000000000..ddfb07d6a2
--- /dev/null
+++ b/doc/fr/release_notes/centreon-2.6.5.rst
@@ -0,0 +1,30 @@
+==============
+Centreon 2.6.5
+==============
+
+
+******
+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
+*********
+
+Security fixes
+==============
+
+- #3831: XSS injection in object lists (ZSL-2015-5266)
+- #3835: CRSF Issues on Centreon (ZSL-2015-5263)
+
+Bug fixes
+=========
+
+- #3821: Upgrade from 2.6.1 to 2.6.3 kill Centreon Frontend
+- #3826: Split Component and zoom doesn't work
+- #3827: Service Group Details page isn't displayed for non admin in Centreon 2.6.3
+- #3837: Relation of passive service with SNMP traps problem with multihost link
+- #3842: Full logs display on event logs page for a non admin user
diff --git a/install.sh b/install.sh
index 446d48c4df..cf509ff52d 100755
--- a/install.sh
+++ b/install.sh
@@ -50,7 +50,7 @@
 # -- on upgrade, overwrite existing ? backup ? 
 
 # Define centreon version
-version="2.6.4"
+version="2.6.5"
 
 # Debug
 #set -x
-- 
GitLab