From 3038f5f5a2cffe142c8c26742998cd748fb536cc Mon Sep 17 00:00:00 2001
From: rwerquin <rwerquin@merethis.com>
Date: Mon, 5 Oct 2015 16:03:47 +0200
Subject: [PATCH] prepare version 2.6.4

---
 CHANGELOG                               | 10 ++++++++++
 doc/en/release_notes/centreon-2.6.4.rst | 26 +++++++++++++++++++++++++
 doc/fr/release_notes/centreon-2.6.4.rst | 26 +++++++++++++++++++++++++
 install.sh                              |  2 +-
 www/install/insertBaseConf.sql          |  2 +-
 5 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 doc/en/release_notes/centreon-2.6.4.rst
 create mode 100644 doc/fr/release_notes/centreon-2.6.4.rst

diff --git a/CHANGELOG b/CHANGELOG
index aa63e817ea..1b3c67871c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+## Centreon 2.6.4
+
+#3793: Porblem when creating an empty hostgroup with non admin user
+#3795: Update Centreon Administration About page (forge -> Github)
+#3796: Problem when connect two time with same user in API
+#3797: Password in macro
+#3800: Current State Duration isn't displayed
+#3803: ACL : Manage multiple Resources group on the same ACL user group
+#3807: Unable to enable status option on main.cfg
+
 ## Centreon 2.6.3
 
 Bug fixes
diff --git a/doc/en/release_notes/centreon-2.6.4.rst b/doc/en/release_notes/centreon-2.6.4.rst
new file mode 100644
index 0000000000..8ccc7c5204
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.6.4.rst
@@ -0,0 +1,26 @@
+==============
+Centreon 2.6.4
+==============
+
+
+******
+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
+=========
+
+- #3793: Porblem when creating an empty hostgroup with non admin user
+- #3795: Update Centreon Administration About page (forge -> Github)
+- #3796: Problem when connect two time with same user in API
+- #3797: Password in macro
+- #3800: Current State Duration isn't displayed
+- #3803: ACL : Manage multiple Resources group on the same ACL user group
+- #3807: Unable to enable status option on main.cfg
diff --git a/doc/fr/release_notes/centreon-2.6.4.rst b/doc/fr/release_notes/centreon-2.6.4.rst
new file mode 100644
index 0000000000..8ccc7c5204
--- /dev/null
+++ b/doc/fr/release_notes/centreon-2.6.4.rst
@@ -0,0 +1,26 @@
+==============
+Centreon 2.6.4
+==============
+
+
+******
+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
+=========
+
+- #3793: Porblem when creating an empty hostgroup with non admin user
+- #3795: Update Centreon Administration About page (forge -> Github)
+- #3796: Problem when connect two time with same user in API
+- #3797: Password in macro
+- #3800: Current State Duration isn't displayed
+- #3803: ACL : Manage multiple Resources group on the same ACL user group
+- #3807: Unable to enable status option on main.cfg
diff --git a/install.sh b/install.sh
index e2e5461a50..446d48c4df 100755
--- a/install.sh
+++ b/install.sh
@@ -50,7 +50,7 @@
 # -- on upgrade, overwrite existing ? backup ? 
 
 # Define centreon version
-version="2.6.3"
+version="2.6.4"
 
 # Debug
 #set -x
diff --git a/www/install/insertBaseConf.sql b/www/install/insertBaseConf.sql
index b92a37af5b..dec2c1a4b7 100644
--- a/www/install/insertBaseConf.sql
+++ b/www/install/insertBaseConf.sql
@@ -3,7 +3,7 @@
 -- Insert version
 --
 
-INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '2.6.3');
+INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '2.6.4');
 
 --
 -- Contenu de la table `contact`
-- 
GitLab