resolve conflicts

This commit is contained in:
Sarah Hersh 2019-03-19 13:09:38 -04:00 committed by Sarah Hersh
parent a7ef3686af
commit d182d7cb74

View file

@ -133,7 +133,9 @@ error messages.
`logging.silent:`:: *Default: false* Set the value of this setting to `true` to suppress all logging output.
[[logging-verbose]]`logging.verbose:`:: *Default: false* Set the value of this setting to `true` to log all events, including system usage information and all requests. Supported on Elastic Cloud Enterprise.
`logging.timezone`:: *Default: UTC* Set to the canonical timezone id
(for example, `America/Los_Angeles`) to log events using that timezone. A list of timezones can
be referenced at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones.
`logging.timezone`:: *Default: UTC* Set to the canonical timezone id (e.g. `US/Pacific`) to log events using that timezone. A list of timezones can be referenced at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones.