Merge branch 'master' into bugfix/pgsql-queries-apply-lower-on-select-columns-10364

This commit is contained in:
Johannes Meyer 2015-11-12 09:18:06 +01:00
commit 651ce0bd04
2 changed files with 3 additions and 0 deletions

View File

@ -18,6 +18,7 @@ class HostStatus extends DataView
'host_address', 'host_address',
'host_address6', 'host_address6',
'host_state', 'host_state',
'host_hard_state',
'host_state_type', 'host_state_type',
'host_handled', 'host_handled',
'host_unhandled', 'host_unhandled',

View File

@ -15,6 +15,7 @@ class ServiceStatus extends DataView
'host_name', 'host_name',
'host_display_name', 'host_display_name',
'host_state', 'host_state',
'host_hard_state',
'host_state_type', 'host_state_type',
'host_last_state_change', 'host_last_state_change',
'host_address', 'host_address',
@ -24,6 +25,7 @@ class ServiceStatus extends DataView
'service_description', 'service_description',
'service_display_name', 'service_display_name',
'service_state', 'service_state',
'service_hard_state',
'service_in_downtime', 'service_in_downtime',
'service_acknowledged', 'service_acknowledged',
'service_handled', 'service_handled',