diff --git a/CHANGELOG b/CHANGELOG index aa63e817ea1041257c966750e5d34c979b822be7..1b3c67871c1ca4dee19f45278e54d4dffd4e2285 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 0000000000000000000000000000000000000000..8ccc7c52046e2f7dc35897a8d21da3e5dbb0f264 --- /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 0000000000000000000000000000000000000000..8ccc7c52046e2f7dc35897a8d21da3e5dbb0f264 --- /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 e2e5461a508547637a256238f21579240e6786b6..446d48c4df4579538e2ef90719eaf33ad5bd2613 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 b92a37af5b859be6c3f56d8ef1a3e53df0c03fd3..dec2c1a4b7eab845a39f1b1577606678a4a02f18 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`