Repository: trafficserver Updated Branches: refs/heads/master 19a81f4e2 -> 278306edf
TS-3178: Maintain backwards compatability with old config Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/278306ed Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/278306ed Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/278306ed Branch: refs/heads/master Commit: 278306edf0204182b6a3547a1d460c6341f6e6c0 Parents: 19a81f4 Author: Brian Geffon <bri...@apache.org> Authored: Tue Nov 11 13:19:08 2014 -0800 Committer: Brian Geffon <bri...@apache.org> Committed: Tue Nov 11 13:19:08 2014 -0800 ---------------------------------------------------------------------- iocore/eventsystem/EventSystem.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/278306ed/iocore/eventsystem/EventSystem.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/EventSystem.cc b/iocore/eventsystem/EventSystem.cc index 42c91f0..853f5e5 100644 --- a/iocore/eventsystem/EventSystem.cc +++ b/iocore/eventsystem/EventSystem.cc @@ -36,10 +36,9 @@ ink_event_system_init(ModuleVersion v) ink_release_assert(!checkModuleVersion(v, EVENT_SYSTEM_MODULE_VERSION)); int config_max_iobuffer_size = DEFAULT_MAX_BUFFER_SIZE; - REC_EstablishStaticConfigInt32(thread_freelist_high_watermark, "proxy.config.allocator.thread_freelist_high_watermark"); - // For backwards compatability make sure to allow thread_freelist_size - REC_EstablishStaticConfigInt32(thread_freelist_low_watermark, "proxy.config.allocator.thread_freelist_size"); + REC_EstablishStaticConfigInt32(thread_freelist_high_watermark, "proxy.config.allocator.thread_freelist_size"); + REC_EstablishStaticConfigInt32(thread_freelist_high_watermark, "proxy.config.allocator.thread_freelist_high_watermark"); REC_EstablishStaticConfigInt32(thread_freelist_low_watermark, "proxy.config.allocator.thread_freelist_low_watermark"); REC_ReadConfigInteger(config_max_iobuffer_size, "proxy.config.io.max_buffer_size");