From 1e6a82687bdaf810e0723194781d8055a21cbf2b Mon Sep 17 00:00:00 2001
From: rwerquin <rwerquin@merethis.com>
Date: Tue, 22 Sep 2015 15:53:14 +0200
Subject: [PATCH] prepare version 2.6.3

---
 CHANGELOG                                     | 13 ++++++++++
 doc/en/release_notes/centreon-2.6.3.rst       | 25 +++++++++++++++++++
 doc/fr/release_notes/centreon-2.6.3.rst       | 25 +++++++++++++++++++
 install.sh                                    |  2 +-
 .../sql/centreon/Update-DB-2.6.2_to_2.6.3.sql |  2 ++
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 doc/en/release_notes/centreon-2.6.3.rst
 create mode 100644 doc/fr/release_notes/centreon-2.6.3.rst
 create mode 100644 www/install/sql/centreon/Update-DB-2.6.2_to_2.6.3.sql

diff --git a/CHANGELOG b/CHANGELOG
index 3cb3122c42..aa63e817ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+## Centreon 2.6.3
+
+Bug fixes
+=========
+
+#564: Filter field does not work in service groups monitoring screen
+#1000: Services of service groups are dispatched on many pages
+#3782: SQL Keyswords
+#3783: index_data switch in option form
+#3788: Problem with static keywords
+
+
+
 ## Centreon 2.6.2
 
 Features
diff --git a/doc/en/release_notes/centreon-2.6.3.rst b/doc/en/release_notes/centreon-2.6.3.rst
new file mode 100644
index 0000000000..f9e1803725
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.6.3.rst
@@ -0,0 +1,25 @@
+==============
+Centreon 2.6.3
+==============
+
+
+******
+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
+=========
+
+- #564: Filter field does not work in service groups monitoring screen
+- #1000: Services of service groups are dispatched on many pages
+- #3782: SQL Keyswords
+- #3783: index_data switch in option form
+- #3788: Problem with static keywords
+- 
diff --git a/doc/fr/release_notes/centreon-2.6.3.rst b/doc/fr/release_notes/centreon-2.6.3.rst
new file mode 100644
index 0000000000..f9e1803725
--- /dev/null
+++ b/doc/fr/release_notes/centreon-2.6.3.rst
@@ -0,0 +1,25 @@
+==============
+Centreon 2.6.3
+==============
+
+
+******
+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
+=========
+
+- #564: Filter field does not work in service groups monitoring screen
+- #1000: Services of service groups are dispatched on many pages
+- #3782: SQL Keyswords
+- #3783: index_data switch in option form
+- #3788: Problem with static keywords
+- 
diff --git a/install.sh b/install.sh
index 07cb702449..ea5b7ff32d 100755
--- a/install.sh
+++ b/install.sh
@@ -50,7 +50,7 @@
 # -- on upgrade, overwrite existing ? backup ? 
 
 # Define centreon version
-version="2.6.2"
+version="2.6.3"
 
 # Debug
 #set -x
diff --git a/www/install/sql/centreon/Update-DB-2.6.2_to_2.6.3.sql b/www/install/sql/centreon/Update-DB-2.6.2_to_2.6.3.sql
new file mode 100644
index 0000000000..d3a7e3cd15
--- /dev/null
+++ b/www/install/sql/centreon/Update-DB-2.6.2_to_2.6.3.sql
@@ -0,0 +1,2 @@
+-- Change version of Centreon
+UPDATE `informations` SET `value` = '2.6.3' WHERE CONVERT( `informations`.`key` USING utf8 )  = 'version' AND CONVERT ( `informations`.`value` USING utf8 ) = '2.6.2' LIMIT 1;
-- 
GitLab