From: Tom Hughes Date: Thu, 4 Aug 2016 20:50:49 +0000 (+0100) Subject: Merge remote-tracking branch 'github/pull/76' X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5024597e8fbf7cf262c7d0990296813fd3277696?hp=3da3f2d77d452db7a79df46a82af096e3b7f37dc Merge remote-tracking branch 'github/pull/76' --- diff --git a/cookbooks/postgresql/templates/default/postgresql.conf.erb b/cookbooks/postgresql/templates/default/postgresql.conf.erb index 28cdcaafb..754131e73 100644 --- a/cookbooks/postgresql/templates/default/postgresql.conf.erb +++ b/cookbooks/postgresql/templates/default/postgresql.conf.erb @@ -58,7 +58,9 @@ commit_delay = <%= @settings[:commit_delay] || @defaults[:commit_delay] %> # - Checkpoints - +<% if @version.to_f < 9.5 %> checkpoint_segments = <%= @settings[:checkpoint_segments] || @defaults[:checkpoint_segments] %> +<% end -%> checkpoint_timeout = <%= @settings[:checkpoint_timeout] || @defaults[:checkpoint_timeout] %> checkpoint_completion_target = <%= @settings[:checkpoint_completion_target] || @defaults[:checkpoint_completion_target] %>