← Back to branch summary

~shinken-dev/shinken/trunk

~shinken-dev/shinken/trunk

Viewing all changes in revision 1356.

Committer: naparuba
Date: 2011-04-12 09:45:55 UTC
mfrom: (1354.1.4)
Revision ID: git-v1:9b9ed5cf6c945794524967e71ee51134f2b6a9ea

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

files modified:
THANKS

etc/shinken-specific.cfg

shinken/objects/discoveryrule.py

shinken/objects/discoveryrun.py

shinken/objects/hostdependency.py

shinken/objects/item.py

shinken/objects/resultmodulation.py

shinken/objects/servicedependency.py

test/etc/test_stack2/shinken-specific-ha-only.cfg

test/etc/test_stack2/shinken-specific-lb-only.cfg

test/etc/test_stack2/shinken-specific-passive-poller.cfg

test/quick_tests.sh

Show diffs side-by-side

added added

removed removed

etc/shinken-specific.cfg

shinken/objects/discoveryrule.py

shinken/objects/discoveryrun.py

shinken/objects/hostdependency.py

shinken/objects/item.py

shinken/objects/resultmodulation.py

shinken/objects/servicedependency.py

test/etc/test_stack2/shinken-specific-ha-only.cfg

test/etc/test_stack2/shinken-specific-lb-only.cfg

test/etc/test_stack2/shinken-specific-passive-poller.cfg

test/quick_tests.sh

Older »