Revision 824de5d7

Merge remote branch 'origin/release-2.0'

Conflicts:
connector-metro/src/vigilo/connector_metro/nodetorrdtool.py
connector-metro/src/vigilo/connector_metro/test/test_nodetorrdtool.py
connector-rrdreport/settings_tests.ini
connector-script/src/vigilo/connector_script/script.py
connector-script/src/vigilo/connector_script/test/test_process.py
connector-script/src/vigilo/connector_script/test/test_script.py
connector-syncevents/settings.ini
connector/src/vigilo/connector/client.py
correlator-enterprise/src/vigilo/correlator_enterprise/rules/hls_deps.py
correlator-enterprise/src/vigilo/correlator_enterprise/test/rules/hls_deps/helpers.py
correlator-enterprise/src/vigilo/correlator_enterprise/test/rules/hls_deps/test_computation_order.py
correlator-enterprise/src/vigilo/correlator_enterprise/test/rules/hls_deps/test_op_and.py
correlator-enterprise/src/vigilo/correlator_enterprise/test/rules/hls_deps/test_op_or.py
correlator-enterprise/src/vigilo/correlator_enterprise/test/rules/hls_deps/test_op_plus.py
correlator-enterprise/src/vigilo/correlator_enterprise/test/rules/hls_deps/test_rule_hls_deps.py
correlator/src/vigilo/correlator/correvent.py
correlator/src/vigilo/correlator/test/rules/svc_on_host_down/test_rule.py
models/src/vigilo/models/migration/001_initial_version.py
models/src/vigilo/models/migration/002_Host_mainip_is_really_an_address.py
models/src/vigilo/models/migration/003_group_name_and_types_are_not_unique.py
models/src/vigilo/models/migration/004_MapSegment_color_and_thickness_are_mandatory.py
models/src/vigilo/models/migration/005_User_optional_non_unique_email.py
models/src/vigilo/models/migration/006_VigiloServer_can_be_disabled.py
models/src/vigilo/models/migration/007_Link_between_LowLevelService_and_Collector.py
models/src/vigilo/models/migration/008_Refactoring_for_dependencies.py
models/src/vigilo/models/migration/009_Link_between_Host_and_ConfFile.py
models/src/vigilo/models/migration/010_Roles_for_DependencyGroup.py
models/src/vigilo/models/migration/011_Rename_DSes_in_MapServiceLink.py
models/src/vigilo/models/migration/012_ConfFile_name_index.py
models/src/vigilo/models/migration/013_ConfFile_name_type.py
models/src/vigilo/models/migration/014_Text_types.py
models/src/vigilo/models/migration/015_SupItem_itemtype.py
models/src/vigilo/models/migration/016_View_for_group_paths.py
models/src/vigilo/models/migration/017_Token_for_users.py
models/src/vigilo/models/migration/018_View_for_users_supitems.py
models/src/vigilo/models/migration/019_Per_supitem_tags.py
models/src/vigilo/models/migration/020_No_correlation_in_db.py
models/src/vigilo/models/migration/021_correvent_timestamp_active_index.py
models/src/vigilo/models/migration/022_HLS_weight.py
models/src/vigilo/models/migration/023_Rename_old_foreign_keys.py
models/src/vigilo/models/migration/024_Deferrable_constraints.py
models/src/vigilo/models/migration/025_Index_for_ConfItems.py
models/src/vigilo/models/migration/026_Index_for_correlation.py
models/src/vigilo/models/migration/027_Renaming_in_secondary_tables.py
models/src/vigilo/models/migration/028_Different_HLS_priorities.py
models/src/vigilo/models/migration/029_Colorful_history.py
models/src/vigilo/models/migration/030_Integer_for_Acknowledgement.py
models/src/vigilo/models/migration/031_Drop_checkhostcmd.py
models/src/vigilo/models/migration/032_Impact_for_events.py
models/src/vigilo/models/migration/033_Warning_weight_for_services.py
models/src/vigilo/models/test/test_statename.py
themes-default/jsl.cfg
turbogears/pkg/turbogears.redhat.spec
vigiboard/Makefile
vigiboard/vigiboard/controllers/plugins/details.py
vigiconf-enterprise/settings_tests.ini

Change-Id: Icae8e4bcec00a494ebeac7df019271cecae35954

Files

• added
• modified
• copied
• renamed
• deleted