Merge branch '2.8.x' of https://github.com/centreon/centreon into 2.8.x

centreon · Aug 3, 2017 · 087ed9b · 087ed9b
2 parents 8339f6a + 1d553fc
commit 087ed9b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/doc/en/release_notes/centreon-2.8/centreon-2.8.11.rst b/doc/en/release_notes/centreon-2.8/centreon-2.8.11.rst
@@ -5,6 +5,18 @@ Centreon Web 2.8.11
 Enhancements
 ============
 
+* Fix typos in Enabled/Disabled filters PR #5251
+* Do not list meta services in list of service to add to a SNMP trap #5418 PR #5419
+
 Bugfix
 ======
 
+* Knowledgebase - Delete wiki page not functional #5059
+* Massive Change don't modify the Recovery notification delay of a host #5451
+* Impossible to acknowledge several object from custom views #5420
+* Load custom views - fixed database entry duplication PR #5260
+* Adding SNMP traps definition : values set to fields in Relations tab are not saved #5406 PR #5415 PR #5417
+* SNMP Trap, not all parameters are saved on creation #5361 PR #5415 PR #5417
+* Page "Services by Servicegroup > Diplay > Summary" not working #5399 PR #5416
+* [CLAPI] Duplicate CMD in export #5455
+* [CLAPI] Fatal error with PDOException #5453 PR #5462
diff --git a/doc/fr/release_notes/centreon-2.8/centreon-2.8.11.rst b/doc/fr/release_notes/centreon-2.8/centreon-2.8.11.rst
@@ -5,6 +5,18 @@ Centreon Web 2.8.11
 Enhancements
 ============
 
+* Fix typos in Enabled/Disabled filters PR #5251
+* Do not list meta services in list of service to add to a SNMP trap #5418 PR #5419
+
 Bugfix
 ======
 
+* Knowledgebase - Delete wiki page not functional #5059
+* Massive Change don't modify the Recovery notification delay of a host #5451
+* Impossible to acknowledge several object from custom views #5420
+* Load custom views - fixed database entry duplication PR #5260
+* Adding SNMP traps definition : values set to fields in Relations tab are not saved #5406 PR #5415 PR #5417
+* SNMP Trap, not all parameters are saved on creation #5361 PR #5415 PR #5417
+* Page "Services by Servicegroup > Diplay > Summary" not working #5399 PR #5416
+* [CLAPI] Duplicate CMD in export #5455
+* [CLAPI] Fatal error with PDOException #5453 PR #5462
diff --git a/features/bootstrap/KnowledgeBaseContext.php b/features/bootstrap/KnowledgeBaseContext.php
@@ -4,6 +4,7 @@
 use Centreon\Test\Behat\Configuration\HostConfigurationPage;
 use Centreon\Test\Behat\Configuration\KBServiceListingPage;
 use Centreon\Test\Behat\Configuration\ServiceConfigurationPage;
+use Centreon\Test\Behat\Administration\KBParametersPage;
 
 /**
  * Defines application features from the specific context.
@@ -29,6 +30,16 @@ public function iAmLoggedInACentreonServerWithWikiInstalled()
             $this->container->getPort(80, 'mediawiki') . '/index.php/Main_Page'
         );
         $this->iAmLoggedIn();
+
+        $containerId = $this->container->getContainerId('mediawiki', false);
+        $page = new KBParametersPage($this);
+        $page->setProperties(
+            array(
+                'kb_db_host' => $containerId,
+                'kb_wiki_url' => 'http://' . $containerId
+            )
+        );
+        $page->save();
     }
 
     /**