Private GIT

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

centreon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7aa8a581

Commit 7aa8a581 authored 8 years ago by Kevin Duret

Downloads
- Plain Diff

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

parents b1e99f45 1b5f17a8

Branches

Tags

Loading

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

cron/centKnowledgeSynchronizer.php 9 additions, 3 deletions

cron/centKnowledgeSynchronizer.php
doc/en/configuration_guide/advanced_configuration/traps.rst 3 additions, 0 deletions

doc/en/configuration_guide/advanced_configuration/traps.rst
doc/fr/configuration_guide/advanced_configuration/traps.rst 4 additions, 0 deletions

doc/fr/configuration_guide/advanced_configuration/traps.rst
www/include/monitoring/status/Hosts/xml/hostXML.php 1 addition, 1 deletion

www/include/monitoring/status/Hosts/xml/hostXML.php
www/include/monitoring/status/Notifications/notifications.php 14 additions, 5 deletions

...include/monitoring/status/Notifications/notifications.php
www/include/monitoring/status/Services/xml/serviceXML.php 11 additions, 5 deletions

www/include/monitoring/status/Services/xml/serviceXML.php
www/install/createTablesCentstorage.sql 1 addition, 1 deletion

www/install/createTablesCentstorage.sql
www/install/sql/centstorage/Update-DB-2.8.0-beta1_to_2.8.0-beta2.sql 2 additions, 0 deletions

.../sql/centstorage/Update-DB-2.8.0-beta1_to_2.8.0-beta2.sql

with 45 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Another place to be (or not)