← Back to branch summary

~shinken-dev/shinken/trunk

~shinken-dev/shinken/trunk

Viewing all changes in revision 3446.1.2.

Committer: Sébastien Coavoux
Date: 2013-07-15 20:43:08 UTC
mfrom: (3455.2.2)
mto: (3459.1.1)
mto: This revision was merged to the branch mainline in revision 3461.
Revision ID: git-v1:8e044671ded8a7b61fac5b6c4aba0e161534ce28

Merge branch 'master' of github.com:naparuba/shinken

files added:
modules/syslogsink

modules/syslogsink/__init__.py

modules/syslogsink/module.py

test/etc/antivirg

test/etc/antivirg/hosts.cfg

test/etc/nagios_antivirg.cfg

test/test_antivirg.py

files removed:
modules/syslog

modules/syslog/__init__.py

modules/syslog/module.py

files modified:
THANKS

etc/resource.cfg

shinken/external_command.py

shinken/objects/config.py

shinken/objects/item.py

shinken/objects/service.py

shinken/util.py

test/jenkins/longtests.txt

test/jenkins/shorttests.txt

test/quick_tests.sh

test/test_escalations.py

test/test_livestatus_allowedhosts.py

test/test_properties_defaults.py

Show diffs side-by-side

added added

removed removed

etc/resource.cfg

modules/syslog/

modules/syslog/__init__.py

modules/syslog/module.py

modules/syslogsink/

modules/syslogsink/__init__.py

modules/syslogsink/module.py

shinken/external_command.py

shinken/objects/config.py

shinken/objects/item.py

shinken/objects/service.py

shinken/util.py

test/etc/antivirg/

test/etc/antivirg/hosts.cfg

test/etc/nagios_antivirg.cfg

test/jenkins/longtests.txt

test/jenkins/shorttests.txt

test/quick_tests.sh

test/test_antivirg.py

test/test_escalations.py

test/test_livestatus_allowedhosts.py

test/test_properties_defaults.py

Older »